diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index a5449181f..b9b9a3b39 100644
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -612,13 +612,17 @@ void ApiListener::SyncRelayMessage(const MessageOrigin::Ptr& origin,
 		}
 
 		/* don't relay messages to disconnected endpoints */
-		if (!endpoint->IsConnected())
+		if (!endpoint->IsConnected()) {
+			if (target_zone == my_zone)
+				finishedLogZones.erase(target_zone);
+
 			continue;
+		}
 
 		finishedLogZones.insert(target_zone);
 
-		/* don't relay the message to the zone through more than one endpoint */
-		if (finishedZones.find(target_zone) != finishedZones.end()) {
+		/* don't relay the message to the zone through more than one endpoint unless this is our own zone */
+		if (finishedZones.find(target_zone) != finishedZones.end() && target_zone != my_zone) {
 			skippedEndpoints.push_back(endpoint);
 			continue;
 		}