diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java b/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java
index c47a2ae..5bd30a4 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java
@@ -20,6 +20,7 @@
 package de.steamwar.fightsystem.commands;
 
 import de.steamwar.fightsystem.ArenaMode;
+import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.record.PacketProcessor;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
@@ -28,10 +29,10 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class SkipCommand  implements CommandExecutor {
+public class SkipCommand implements CommandExecutor {
 
     public SkipCommand() {
-        new StateDependentCommand(ArenaMode.AntiPrepare, FightState.TeamFix, "skip", this);
+        new StateDependentCommand(ArenaMode.AntiPrepare, ArenaMode.Replay.contains(Config.mode) ? FightState.All : FightState.TeamFix, "skip", this);
     }
 
     @Override