diff --git a/src/de/steamwar/misslewars/listener/ArenaListener.java b/src/de/steamwar/misslewars/listener/ArenaListener.java
index d9dfc49..92aacd9 100644
--- a/src/de/steamwar/misslewars/listener/ArenaListener.java
+++ b/src/de/steamwar/misslewars/listener/ArenaListener.java
@@ -2,6 +2,7 @@ package de.steamwar.misslewars.listener;
 
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
+import de.steamwar.misslewars.MissileWars;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -26,7 +27,7 @@ public class ArenaListener extends BasicListener {
 
 		assert location != null;
 		if(location.getY() < Config.ArenaMinY){
-			if(p.getGameMode() == GameMode.SPECTATOR)
+			if(p.getGameMode() == GameMode.SPECTATOR || MissileWars.getFightState() == FightState.WAITING)
 				p.teleport(e.getFrom());
 			else
 				p.damage(20.0f);