diff --git a/src/client/component/client_patches.cpp b/src/client/component/client_patches.cpp
index 5fb92afd..0a2cf29d 100644
--- a/src/client/component/client_patches.cpp
+++ b/src/client/component/client_patches.cpp
@@ -38,8 +38,8 @@ namespace client_patches
 
 		void preload_map_stub(int localClientNum, const char* mapname, const char* gametype)
 		{
+			game::Com_GametypeSettings_SetGametype(gametype, false, false);
 			stop_zombies_intro_if_needed();
-
 			preload_map_hook.invoke(localClientNum, mapname, gametype);
 		}
 
diff --git a/src/client/component/party.cpp b/src/client/component/party.cpp
index 497927c8..5c919727 100644
--- a/src/client/component/party.cpp
+++ b/src/client/component/party.cpp
@@ -173,8 +173,7 @@ namespace party
 			{
 				if (is_connecting_to_dedi)
 				{
-					game::Com_SessionMode_SetGameMode(game::MODE_GAME_DEFAULT);
-					game::Com_GametypeSettings_SetGametype(gametype.data(), false, false);
+					game::Com_SessionMode_SetGameMode(game::MODE_GAME_MATCHMAKING_PLAYLIST);
 				}
 
 				//connect_to_session(target, hostname, xuid, mode);