diff --git a/scripts/zm/main/_zm_reimagined_zgrief.gsc b/scripts/zm/main/_zm_reimagined_zgrief.gsc
index 791e3116..8d16624f 100644
--- a/scripts/zm/main/_zm_reimagined_zgrief.gsc
+++ b/scripts/zm/main/_zm_reimagined_zgrief.gsc
@@ -1568,7 +1568,5 @@ spawn_bots(num)
 		{
 			level.bots[i] = addtestclient();
 		}
-
-		wait 0.4; // need wait or bots don't spawn at correct origin
 	}
 }
\ No newline at end of file
diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc
index e28dce08..88bb5f3f 100644
--- a/scripts/zm/replaced/_zm.gsc
+++ b/scripts/zm/replaced/_zm.gsc
@@ -203,7 +203,7 @@ getfreespawnpoint( spawnpoints, player )
 
 			foreach(player in players)
 			{
-				if(player != self && player.team == self.team && player.playernum == num)
+				if(player != self && isDefined(player.team_set) && player.team == self.team && player.playernum == num)
 				{
 					valid_num = false;
 					break;