diff --git a/lib/methods/clusterzonechecktask.cpp b/lib/methods/clusterzonechecktask.cpp
index f1a3eb9c6..8cd788ad1 100644
--- a/lib/methods/clusterzonechecktask.cpp
+++ b/lib/methods/clusterzonechecktask.cpp
@@ -86,13 +86,11 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
 	BOOST_FOREACH(const Endpoint::Ptr& endpoint, zone->GetEndpoints()) {
 		double eplag = Utility::GetTime() - endpoint->GetRemoteLogPosition();
 
-		if (eplag > lag)
-			lag = eplag;
-
-		if (endpoint->IsConnected()) {
+		if (endpoint->IsConnected())
 			connected = true;
-			break;
-		}
+
+		if ((endpoint->GetSyncing() || !endpoint->IsConnected()) && eplag > lag)
+			lag = eplag;
 	}
 
 	if (!connected) {