diff --git a/sat/plugins/plugin_xep_0077.py b/sat/plugins/plugin_xep_0077.py
index 2a39a5f8..aa48aaba 100644
--- a/sat/plugins/plugin_xep_0077.py
+++ b/sat/plugins/plugin_xep_0077.py
@@ -303,4 +303,8 @@ class XEP_0077(object):
             iq_elt["to"] = to_jid.full()
         query_elt = iq_elt.addElement((NS_REG, "query"))
         query_elt.addElement("remove")
-        return iq_elt.send()
+        d = iq_elt.send()
+        if not to_jid or to_jid == jid.JID(client.jid.host):
+            d.addCallback(lambda __: client.entityDisconnect())
+        return d
+