diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java
index 9642c6d..dc31e1e 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java
@@ -60,6 +60,11 @@ public class EventJoin implements Listener {
         Player player = event.getPlayer();
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
 
+        if(user.getId() == FightSystem.getEventFight().getKampfleiter()){
+            FightSystem.setEventLeiter(player);
+            return;
+        }
+
         if(FightState.Setup.contains(FightState.getFightState())){
             FightTeam team = null;
             if(user.getTeam() == Config.EventTeamBlueID)
@@ -85,10 +90,6 @@ public class EventJoin implements Listener {
             }
         }
 
-        if(user.getId() == FightSystem.getEventFight().getKampfleiter()){
-            FightSystem.setEventLeiter(player);
-            return;
-        }
         if(Config.LiveReplay)
             player.kickPlayer(FightSystem.getMessage().parse("NO_PARTICIPANT", player));
     }