diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index f1e49b83..d1d99ecb 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3749,7 +3749,7 @@ static void HandlePacketFromAwayNode(SINT8 node)
 			///       Also, according to HandleConnect, the server will send the savegame even during intermission...
 			/// Sryder 2018-07-05: If we don't want to send the player config another way we need to send the gamestate
 			///                    At almost any gamestate there could be joiners... So just always send gamestate?
-			cl_mode = CL_DOWNLOADSAVEGAME;
+			cl_mode = ((node == servernode) ? CL_CONNECTED : CL_DOWNLOADSAVEGAME);
 #else
 			cl_mode = CL_CONNECTED;
 #endif