diff --git a/lib/remote/jsonrpcconnection-pki.cpp b/lib/remote/jsonrpcconnection-pki.cpp
index 340e12b30..12b772303 100644
--- a/lib/remote/jsonrpcconnection-pki.cpp
+++ b/lib/remote/jsonrpcconnection-pki.cpp
@@ -286,14 +286,6 @@ delayed_request:
 	Log(LogInformation, "JsonRpcConnection")
 		<< "Certificate request for CN '" << cn << "' is pending. Waiting for approval.";
 
-	if (origin) {
-		auto client (origin->FromClient);
-
-		if (client && !client->GetEndpoint()) {
-			client->Disconnect();
-		}
-	}
-
 	return result;
 }