diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
index d1e888f..eac082b 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
@@ -94,6 +94,7 @@ public class FightTeam {
         team.setAllowFriendlyFire(false);
 
         new OneShotStateDependent(ArenaMode.Restartable, FightState.PreLeaderSetup, () -> Bukkit.getScheduler().runTask(FightSystem.getPlugin(), this::reset));
+        new OneShotStateDependent(Config.replayserver(), FightState.PreLeaderSetup, () -> Bukkit.getScheduler().runTask(FightSystem.getPlugin(), this::reset));
     }
 
     public void setPrefixAndName(String prefix, String name){
diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java b/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java
index f5e87ff..610168f 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java
@@ -41,6 +41,12 @@ public class OneShotStateDependent extends StateDependent{
         register();
     }
 
+    public OneShotStateDependent(boolean active, Set<FightState> states, Runnable runnable) {
+        super(active, states);
+        this.runnable = runnable;
+        register();
+    }
+
     @Override
     public void enable() {
         runnable.run();