diff --git a/src/chat.py b/src/chat.py
index 4e80298b7..80ca3b6b2 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -146,7 +146,7 @@ class Chat:
 			windows = self.plugin.windows[self.account][kind]
 			if kind == 'chats':
 				# send 'gone' chatstate to every tabbed chat tab
-				windows[jid].send_chatstate('gone')
+				windows[jid].send_chatstate('gone', jid)
 				gobject.source_remove(self.possible_paused_timeout_id[jid])
 				gobject.source_remove(self.possible_inactive_timeout_id[jid])
 			if self.plugin.systray_enabled and self.nb_unread[jid] > 0:
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index 26bcdf5a5..4290b652d 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -500,10 +500,6 @@ class TabbedChatWindow(chat.Chat):
 
 		if jid is None:
 			jid = self.get_active_jid()
-		
-		# this happens sometime when we close  fastly all tabs
-		if jid is '':
-			return 
 			
 		contact = gajim.get_first_contact_instance_from_jid(self.account, jid)
 
@@ -559,6 +555,7 @@ class TabbedChatWindow(chat.Chat):
 				_('You are no longer in room "%s" or "%s" has left.') % \
 				(room, nick)).get_response()
 			return
+
 		conversation_textview = self.xmls[jid].get_widget('conversation_textview')
 		message_textview = self.xmls[jid].get_widget('message_textview')
 		message_buffer = message_textview.get_buffer()