diff --git a/src/main/java/hellfirepvp/observerlib/common/util/tick/TickManager.java b/src/main/java/hellfirepvp/observerlib/common/util/tick/TickManager.java
index e85d3b2..5edae1b 100644
--- a/src/main/java/hellfirepvp/observerlib/common/util/tick/TickManager.java
+++ b/src/main/java/hellfirepvp/observerlib/common/util/tick/TickManager.java
@@ -3,7 +3,10 @@
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.event.TickEvent;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 /**
  * This class is part of the ObserverLib Mod
@@ -14,11 +17,11 @@
  */
 public class TickManager {
 
-    private final Map<TickEvent.Type, List<ITickHandler>> registeredTickHandlers = new HashMap<>();
+    private final Map<TickEvent.Type, Collection<ITickHandler>> registeredTickHandlers = new HashMap<>();
 
     public TickManager() {
         for (TickEvent.Type type : TickEvent.Type.values()) {
-            registeredTickHandlers.put(type, new ArrayList<>());
+            registeredTickHandlers.put(type, new ConcurrentLinkedQueue<>());
         }
     }