diff --git a/src/me/yaruma/fightsystem/FightSystem.java b/src/me/yaruma/fightsystem/FightSystem.java
index fe8a2ea..88135ac 100644
--- a/src/me/yaruma/fightsystem/FightSystem.java
+++ b/src/me/yaruma/fightsystem/FightSystem.java
@@ -63,7 +63,7 @@ public class FightSystem extends JavaPlugin {
         init();
 
         fightState = FightState.SETUP;
-        Countdown countdown = new Countdown(Config.SetupDuration, new FinishNoPlayersOnline());
+        Countdown countdown = new Countdown(Config.NoPlayerOnlineDuration, new FinishNoPlayersOnline());
         countdown.startTimer(getPlugin());
     }
 
diff --git a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
index 3c08b53..dde3672 100644
--- a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
+++ b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
@@ -94,7 +94,10 @@ public class PlayerJoinListener implements Listener {
             }
         }
 
-        if(Fight.getRedTeam().hasTeamLeader() && Fight.getBlueTeam().hasTeamLeader()) {
+        if(Fight.getRedTeam().getLeader().getPlayer() == player
+                || Fight.getBlueTeam().getLeader().getPlayer() == player
+                && Fight.getBlueTeam().hasTeamLeader()
+                && Fight.getRedTeam().hasTeamLeader()) {
             Countdown.cancelTimerType(CountdownType.NO_PLAYERS_ONLINE);
             Countdown countdown = new Countdown(Config.SetupDuration, new FinishSetupOver());
             countdown.startTimer(instance);