diff --git a/icinga/endpoint.cpp b/icinga/endpoint.cpp
index 701a240ca..9e0148dbd 100644
--- a/icinga/endpoint.cpp
+++ b/icinga/endpoint.cpp
@@ -105,7 +105,7 @@ String Endpoint::GetAddress(void) const
 	} else {
 		JsonRpcClient::Ptr client = GetClient();
 
-		if (!client)
+		if (!client || !client->IsConnected())
 			return "<disconnected endpoint>";
 
 		return client->GetPeerAddress();