diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index e84f72c918..8c250e246d 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -82,7 +82,12 @@ cleanup:
     return;
 
 error:
-    virNetSocketFree(clientsock);
+    if (client) {
+        virNetServerClientClose(client);
+        virNetServerClientFree(client);
+    } else {
+        virNetSocketFree(clientsock);
+    }
 }