diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
index b180f56..93f333b 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
@@ -69,7 +69,6 @@ public class FightSystem extends JavaPlugin {
         TechHider.init();
         FightScoreboard.init();
         RecordSystem.init();
-        ArrowStopper.init();
 
         try {
             CommandRemover.removeAll("gamemode");
@@ -101,6 +100,7 @@ public class FightSystem extends JavaPlugin {
         new GameplayListener();
         new PersonalKitCreator();
         new ScoreboardListener();
+        new ArrowStopper();
         if(Core.getVersion() > 8)
             new VersionDependentListener();
 
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/ArrowStopper.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/ArrowStopper.java
index 46581b4..cd3c11d 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/ArrowStopper.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/ArrowStopper.java
@@ -39,14 +39,8 @@ public class ArrowStopper extends BasicListener {
     private BukkitTask task;
     private static final HashMap<Entity, Location> LAST_LOCATION = new HashMap<>();
 
-    ArrowStopper() {
-        super(EnumSet.of(FightState.RUNNING));
-    }
-
-    public static void init() {
-        if(Config.ArrowTechhiderCollision == 0)
-            return;
-        FightSystem.registerStateDependent(new ArrowStopper());
+    public ArrowStopper() {
+        super(Config.ArrowTechhiderCollision != 0 ? EnumSet.of(FightState.RUNNING) : EnumSet.noneOf(FightState.class));
     }
 
     private void run() {