diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp
index a798dfe68..d4a4a21da 100644
--- a/lib/remote/apilistener-filesync.cpp
+++ b/lib/remote/apilistener-filesync.cpp
@@ -283,8 +283,8 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
 	}
 
 	Log(LogInformation, "ApiListener")
-	    << "Applying config update from endpoint '" << origin->FromClient->GetEndpoint()->GetName() << "' of zone  '"
-	    << origin->FromZone->GetName() << "'";
+	    << "Applying config update from endpoint '" << origin->FromClient->GetEndpoint()->GetName()
+	    << "' of zone '" << GetFromZoneName(origin->FromZone) << "'.";
 
 	Dictionary::Ptr updateV1 = params->Get("update");
 	Dictionary::Ptr updateV2 = params->Get("update_v2");
diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 55f628fa8..21ccae361 100644
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -1245,3 +1245,19 @@ bool ApiListener::IsHACluster(void)
 	return zone->IsSingleInstance();
 }
 
+/* Provide a helper function for zone origin name. */
+String ApiListener::GetFromZoneName(const Zone::Ptr& fromZone)
+{
+	String fromZoneName;
+
+	if (fromZone) {
+		fromZoneName = fromZone->GetName();
+	} else {
+		Zone::Ptr lzone = Zone::GetLocalZone();
+
+		if (lzone)
+			fromZoneName = lzone->GetName();
+	}
+
+	return fromZoneName;
+}
diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
index e7749827f..8e12f0dca 100644
--- a/lib/remote/apilistener.hpp
+++ b/lib/remote/apilistener.hpp
@@ -99,6 +99,7 @@ public:
 	static void UpdateObjectAuthority(void);
 
 	static bool IsHACluster(void);
+	static String GetFromZoneName(const Zone::Ptr& fromZone);
 
 protected:
 	virtual void OnConfigLoaded(void) override;