diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 97b45d8e3..7daa73bc0 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -629,7 +629,11 @@ class ConnectionVcard:
                 # We do as if it comes from the fake_jid
                 frm = groupchat_jid
             our_jid = gajim.get_jid_from_account(self.name)
-            if not iq_obj.getTag('vCard') or iq_obj.getType() == 'error':
+            if (not iq_obj.getTag('vCard') and iq_obj.getType() == 'result') or\
+            iq_obj.getType() == 'error':
+                if id_ in self.groupchat_jids:
+                    frm = self.groupchat_jids[id_]
+                    del self.groupchat_jids[id_]
                 if frm and frm != our_jid:
                     # Write an empty file
                     self._save_vcard_to_hd(frm, '')