diff --git a/src/disco.py b/src/disco.py
index 04d9b6a8e..b2df26b81 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -606,7 +606,8 @@ _('Without a connection, you can not browse available services'))
 
 		# self.browser._get_agent_address() would break when no browser.
 		addr = get_agent_address(self.jid, self.node)
-		del gajim.interface.instances[self.account]['disco'][addr]
+		if addr in gajim.interface.instances[self.account]['disco']:
+			del gajim.interface.instances[self.account]['disco'][addr]
 
 		if self.browser:
 			self.window.hide()