diff --git a/MissileWars/src/de/steamwar/misslewars/MWTeam.java b/MissileWars/src/de/steamwar/misslewars/MWTeam.java
index 7d4224dc..8abc5bc9 100644
--- a/MissileWars/src/de/steamwar/misslewars/MWTeam.java
+++ b/MissileWars/src/de/steamwar/misslewars/MWTeam.java
@@ -185,7 +185,6 @@ public class MWTeam {
     public void leave(Player p) {
         if (!players.contains(p)) return;
 
-        players.remove(p);
         for (ItemStack stack : p.getInventory().getContents()) {
             if (stack == null) continue;
             if (stack.getType() == Material.AIR) continue;
@@ -196,9 +195,11 @@ public class MWTeam {
         p.getInventory().clear();
 
         p.setDisplayName("§7" + p.getName());
-        sbteam.removePlayer(p);
         if (players.isEmpty() && MissileWars.getFightState() == FightState.FIGHTING)
             MissileWars.end(WinReasons.NO_ENEMY, enemy());
+
+        players.remove(p);
+        sbteam.removePlayer(p);
     }
 
     public void reset() {