diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index bd0229d24..37cc7cc1e 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -314,6 +314,7 @@ static void SV_MapRestart_f( void ) {
 	// run a few frames to allow everything to settle
 	for ( i = 0; i < 3; i++ )
 	{
+		Cbuf_Wait();
 		sv.time += 100;
 		VM_Call( gvm, 1, GAME_RUN_FRAME, sv.time );
 	}
@@ -355,6 +356,7 @@ static void SV_MapRestart_f( void ) {
 	}
 
 	// run another frame to allow things to look at all the players
+	Cbuf_Wait();
 	sv.time += 100;
 	VM_Call( gvm, 1, GAME_RUN_FRAME, sv.time );
 	svs.time += 100;
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 2a928a48a..cd82f1411 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -556,6 +556,7 @@ void SV_SpawnServer( const char *mapname, qboolean killBots ) {
 
 	// run a few frames to allow everything to settle
 	for ( i = 0; i < 3; i++ ) {
+		Cbuf_Wait();
 		sv.time += 100;
 		VM_Call( gvm, 1, GAME_RUN_FRAME, sv.time );
 		SV_BotFrame( sv.time );
@@ -601,6 +602,7 @@ void SV_SpawnServer( const char *mapname, qboolean killBots ) {
 	}
 
 	// run another frame to allow things to look at all the players
+	Cbuf_Wait();
 	sv.time += 100;
 	VM_Call( gvm, 1, GAME_RUN_FRAME, sv.time );
 	SV_BotFrame( sv.time );