diff --git a/lib/remoting/endpointmanager.cpp b/lib/remoting/endpointmanager.cpp
index 080f46aa0..a0cb240e8 100644
--- a/lib/remoting/endpointmanager.cpp
+++ b/lib/remoting/endpointmanager.cpp
@@ -147,8 +147,6 @@ void EndpointManager::NewClientHandler(const TcpClient::Ptr& client)
 {
 	JsonRpcClient::Ptr jclient = static_pointer_cast<JsonRpcClient>(client);
 
-	Logger::Write(LogInformation, "icinga", "New client connection from " + jclient->GetPeerAddress());
-
 	m_PendingClients.insert(jclient);
 	jclient->OnConnected.connect(boost::bind(&EndpointManager::ClientConnectedHandler, this, _1));
 	jclient->Start();
@@ -158,6 +156,8 @@ void EndpointManager::ClientConnectedHandler(const TcpClient::Ptr& client)
 {
 	JsonRpcClient::Ptr jclient = static_pointer_cast<JsonRpcClient>(client);
 
+	Logger::Write(LogInformation, "icinga", "New client connection for " + jclient->GetPeerAddress());
+
 	m_PendingClients.erase(jclient);
 
 	shared_ptr<X509> cert = jclient->GetPeerCertificate();