diff --git a/OpenRA.Server/Server.cs b/OpenRA.Server/Server.cs
index 7834cd8669..7e825f62ec 100644
--- a/OpenRA.Server/Server.cs
+++ b/OpenRA.Server/Server.cs
@@ -268,7 +268,7 @@ namespace OpenRA.Server
 							return false;
 						}
 						
-						if (lobbyInfo.Clients.Where( c => c != GetClient(conn) ).Any( c => c.SpawnPoint == spawnPoint )) //TODO: except 0
+						if (lobbyInfo.Clients.Where( c => c != GetClient(conn) ).Any( c => (c.SpawnPoint == spawnPoint) && (c.SpawnPoint != 0) ))
 						{
 							SendChatTo( conn, "You can't be at the same spawn point as another player" );
 							return true;