diff --git a/source/glest_game/network/connection_slot.cpp b/source/glest_game/network/connection_slot.cpp
index 28b8d897a..cf9a5aa73 100644
--- a/source/glest_game/network/connection_slot.cpp
+++ b/source/glest_game/network/connection_slot.cpp
@@ -291,7 +291,7 @@ void ConnectionSlotThread::execute() {
 					eventCopy.eventType = eReceiveSocketData;
 					eventCopy.connectionSlot = slot;
 					eventCopy.eventId = slotIndex;
-					eventCopy.socketTriggered =  socket->hasDataToReadWithWait(5000);
+					eventCopy.socketTriggered =  socket->hasDataToReadWithWait(1000);
 					//eventCopy.socketTriggered =  true;
 
 					if(getQuitStatus() == true) {
diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp
index 8536f17c0..63a40dcea 100644
--- a/source/glest_game/network/server_interface.cpp
+++ b/source/glest_game/network/server_interface.cpp
@@ -1457,6 +1457,12 @@ void ServerInterface::update() {
 
 					dispatchPendingHighlightCellMessages(errorMsgList);
 
+					if(gameHasBeenInitiated == true &&
+							difftime((long int)time(NULL),lastGlobalLagCheckTime) >= LAG_CHECK_GRACE_PERIOD) {
+						std::map<int,bool> mapSlotSignalledList;
+						checkForLaggingClients(mapSlotSignalledList, eventList, socketTriggeredList,errorMsgList);
+					}
+
 					//printf("START Server update #7\n");
 				}
 				else if(gameHasBeenInitiated == true &&