diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
index 52c1772..9d0bb4e 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
@@ -76,7 +76,9 @@ public class LeaveableArena implements Listener {
         if(inArena && !spectator) {
             markInArena(player);
         } else if(!inArena && spectator) {
-            player.setGameMode(spectatorsInArena.remove(player));
+            GameMode mode = spectatorsInArena.remove(player);
+            if(mode != null)
+                player.setGameMode(mode);
         }
     }