diff --git a/client/CServerHandler.cpp b/client/CServerHandler.cpp
index 9e31e2148..a51dedc00 100644
--- a/client/CServerHandler.cpp
+++ b/client/CServerHandler.cpp
@@ -514,6 +514,8 @@ void CServerHandler::sendStartGame(bool allowOnlyAI) const
 		* si = * lsg.initializedStartInfo;
 	}
 	sendLobbyPack(lsg);
+	c->enterLobbyConnectionMode();
+	c->disableStackSendingByID();
 }
 
 void CServerHandler::startGameplay(CGameState * gameState)
diff --git a/server/CVCMIServer.cpp b/server/CVCMIServer.cpp
index 6015608c7..5d392990e 100644
--- a/server/CVCMIServer.cpp
+++ b/server/CVCMIServer.cpp
@@ -230,10 +230,16 @@ bool CVCMIServer::prepareToStartGame()
 		state = EServerState::LOBBY;
 		// FIXME: dirry hack to make sure old CGameHandler::run is finished
 		boost::this_thread::sleep(boost::posix_time::milliseconds(1000));
+		
+		for(auto c : connections)
+		{
+			c->enterLobbyConnectionMode();
+			c->disableStackSendingByID();
+		}
 	}
 
-	if(!gh)
-		gh = std::make_shared<CGameHandler>(this);
+	//if(!gh)
+	gh = std::make_shared<CGameHandler>(this);
 	switch(si->mode)
 	{
 	case StartInfo::CAMPAIGN: