diff --git a/gajim/remote_control.py b/gajim/remote_control.py
index 08904e6f3..82cf0b020 100644
--- a/gajim/remote_control.py
+++ b/gajim/remote_control.py
@@ -324,8 +324,9 @@ class GajimRemote(Server):
             self.on_message_sent)
 
     def on_chatstate_received(self, obj):
-        self.raise_signal('ChatState', (obj.account, [
-            obj.jid, obj.fjid, obj.stanza, obj.resource, obj.chatstate]))
+        chatstate = app.contacts.get_combined_chatstate(
+            obj.account, obj.jid)
+        self.raise_signal('ChatState', (obj.account, [obj.jid, chatstate]))
 
     def on_message_sent(self, obj):
         try: