diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp
index 1d9471764..7a5d72d1f 100644
--- a/source/glest_game/network/server_interface.cpp
+++ b/source/glest_game/network/server_interface.cpp
@@ -263,8 +263,10 @@ bool ServerInterface::clientLagCheck(ConnectionSlot* connectionSlot) {
 				}
 			}
 			// New lag check warning
-			else if(maxFrameCountLagAllowed > 0 && warnFrameCountLagPercent > 0 &&
-					(clientLagCount > (maxFrameCountLagAllowed * warnFrameCountLagPercent))) {
+			else if((maxFrameCountLagAllowed > 0 && warnFrameCountLagPercent > 0 &&
+					 clientLagCount > (maxFrameCountLagAllowed * warnFrameCountLagPercent)) ||
+					(maxClientLagTimeAllowed > 0 && warnFrameCountLagPercent > 0 &&
+					 clientLagTime > (maxClientLagTimeAllowed * warnFrameCountLagPercent)) ) {
 				if(connectionSlot->getLagCountWarning() == false) {
 					connectionSlot->setLagCountWarning(true);