diff --git a/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py
index 4205a4c35f..afe3dfe5df 100644
--- a/bitbake/lib/bb/server/xmlrpc.py
+++ b/bitbake/lib/bb/server/xmlrpc.py
@@ -299,6 +299,8 @@ class BitBakeXMLRPCServerConnection(BitBakeBaseServerConnection):
 
         _, error = self.connection.runCommand(["setFeatures", self.featureset])
         if error:
+            # disconnect the client, we can't make the setFeature work
+            self.connection.removeClient()
             # no need to log it here, the error shall be sent to the client
             raise BaseException(error)