diff --git a/src/de/steamwar/lobby/command/ModifyCommand.java b/src/de/steamwar/lobby/command/ModifyCommand.java
index ba04ac4..e16f9ac 100644
--- a/src/de/steamwar/lobby/command/ModifyCommand.java
+++ b/src/de/steamwar/lobby/command/ModifyCommand.java
@@ -64,6 +64,10 @@ public class ModifyCommand extends SWCommand implements Listener {
 
     @Register("waitinghallspawn")
     public void setWaitingHallSpawn(Player player) {
+        SteamwarUser user = SteamwarUser.get(player.getUniqueId());
+        if(!user.getUserGroup().isTeamGroup())
+            return;
+        
         LobbySystem.config().setWaitingHallSpawn(player.getLocation());
     }
 }