diff --git a/Source/msg.cpp b/Source/msg.cpp
index a067c0588be..dd4f21f30f0 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -144,7 +144,7 @@ bool DownloadDeltaInfo()
 	gsDeltaData.ddDeltaSender = SNPLAYER_ALL;
 	assert(gsDeltaData.ddSendRecvOffset == 0);
 	// trigger delta-download in nthread
-	geBufferMsgs = MSG_GAME_DELTA_WAIT;
+	// assert(geBufferMsgs == MSG_GAME_DELTA_WAIT);
 	//guDeltaStart = SDL_GetTicks();
 	success = UiProgressDialog("Waiting for game data...", msg_wait_for_delta);
 	assert(geBufferMsgs == MSG_NORMAL || !success || gbGameDeltaChunks != MAX_CHUNKS);
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 16cddfaadaf..33ac53b29c7 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -832,6 +832,9 @@ bool NetInit(bool bSinglePlayer)
 			NetClose();
 			continue;
 		}
+		if (gbJoinGame) {
+			geBufferMsgs = MSG_GAME_DELTA_WAIT;
+		}
 		nthread_run();
 		SetupLocalPlr();
 #ifndef NONET