diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index 57979cc5..67e4bc00 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -953,7 +953,8 @@ void MenuStateConnectedGame::update() {
 
 		clientInterface= NetworkManager::getInstance().getClientInterface();
 		if(clientInterface != NULL && clientInterface->isConnected()) {
-			if(clientInterface->getIntroDone() == true &&
+			if(	initialSettingsReceivedFromServer == true &&
+				clientInterface->getIntroDone() == true &&
 				(switchSetupRequestFlagType & ssrft_NetworkPlayerName) == ssrft_NetworkPlayerName) {
 				SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
 				//needToSetChangedGameSettings = false;