diff --git a/lib/remote/endpoint.cpp b/lib/remote/endpoint.cpp
index 85e344030..a7a9e7afe 100644
--- a/lib/remote/endpoint.cpp
+++ b/lib/remote/endpoint.cpp
@@ -83,6 +83,8 @@ void Endpoint::RemoveClient(const ApiClient::Ptr& client)
 
 		Log(LogWarning, "ApiListener")
 		    << "Removing API client for endpoint '" << GetName() << "'. " << m_Clients.size() << " API clients left.";
+
+		SetConnecting(false);
 	}
 
 	bool is_master = ApiListener::GetInstance()->IsMaster();