diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 7550b11c3..7cafffc46 100644
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -771,8 +771,9 @@ void ApiListener::SyncClient(const JsonRpcConnection::Ptr& aclient, const Endpoi
 		}
 
 		Zone::Ptr myZone = Zone::GetLocalZone();
+		auto parent (myZone->GetParent());
 
-		if (myZone->GetParent() == eZone) {
+		if (parent == eZone || !parent && eZone == myZone) {
 			Log(LogInformation, "ApiListener")
 				<< "Requesting new certificate for this Icinga instance from endpoint '" << endpoint->GetName() << "'.";