diff --git a/src/chat_control.py b/src/chat_control.py
index 9a4b45447..86dca43f5 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1119,7 +1119,6 @@ class ChatControl(ChatControlBase):
 
 		if not session:
 			session = gajim.connections[self.account].find_controlless_session(self.contact.jid)
-			self.session = session
 
 		if session:
 			session.control = self
diff --git a/src/message_control.py b/src/message_control.py
index d570cee89..553902bc5 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -43,6 +43,8 @@ class MessageControl:
 		self.hide_chat_buttons = False
 		self.resource = resource
 
+		self.session = None
+
 		gajim.last_message_time[self.account][self.get_full_jid()] = 0
 
 		self.xml = gtkgui_helpers.get_glade('message_window.glade', widget_name)