diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 5dda35a6..879cd9d7 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -564,6 +564,7 @@ void startmap(char *name)   // called just after a map load
 	if(m_botmode) BotManager.BeginMap(name);
     // End add by Rick            
     projreset();
+    resetspawns();
     if(m_ctf) preparectf();
     shotlinereset();
     spawncycle = -1;
@@ -571,7 +572,6 @@ void startmap(char *name)   // called just after a map load
     player1->frags = 0;
     player1->flagscore = 0;
     loopv(players) if(players[i]) players[i]->frags = players[i]->flagscore = 0;
-    resetspawns();
     s_strcpy(clientmap, name);
     if(editmode) toggleedit();
     setvar("gamespeed", 100);