diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index c6b4a9903..0d1f6f1a9 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1304,6 +1304,8 @@ class ConnectionHandlersBase:
 	def delete_session(self, jid, thread_id):
 		if not jid in self.sessions:
 			jid = gajim.get_jid_without_resource(jid)
+		if not jid in self.sessions:
+			return
 
 		del self.sessions[jid][thread_id]