diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index 9c0d529b4..5b6ab5ebd 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -1042,6 +1042,7 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent):
         self.fjid = self.msg_obj.fjid
         self.msgtxt = self.msg_obj.msgtxt
         self.jid = self.msg_obj.jid
+        self.room_jid = self.msg_obj.jid
         self.timestamp = self.msg_obj.timestamp
         self.xhtml_msgtxt = self.stanza.getXHTML()
 
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 846ecc2f6..3b94b3018 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -811,7 +811,7 @@ class GroupchatControl(ChatControlBase):
         menu.destroy()
 
     def _nec_gc_message_received(self, obj):
-        if obj.jid != self.room_jid:
+        if obj.room_jid != self.room_jid or obj.conn.name != self.account:
             return
         if obj.captcha_form:
             if self.form_widget:
@@ -1270,7 +1270,7 @@ class GroupchatControl(ChatControlBase):
             self.draw_role(role)
 
     def _nec_gc_presence_received(self, obj):
-        if obj.room_jid != self.room_jid:
+        if obj.room_jid != self.room_jid or obj.conn.name != self.account:
             return
         if obj.ptype == 'error':
             return