diff --git a/src/session.py b/src/session.py
index 28d9bcb264f9c354e6c78de2ac35b5f644ff42f9..74666c048198802b546e0921bf24de578dcd2d17 100644
--- a/src/session.py
+++ b/src/session.py
@@ -182,7 +182,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
 
 		if not self.control:
 			# look for an existing chat control without a session
-			ctrl = gajim.interface.msg_win_mgr.get_sessionless_ctrl(jid, self.conn.name)
+			ctrl = gajim.interface.msg_win_mgr.get_sessionless_ctrl(self.conn.name, jid)
 			if ctrl:
 				self.control = ctrl
 				self.control.set_session(self)