diff --git a/src/chat_control.py b/src/chat_control.py
index 179971467..4c766e8d7 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -2746,6 +2746,8 @@ class ChatControl(ChatControlBase):
 
         if not contact.supports(NS_CHATSTATES):
             return
+        if contact.our_chatstate == False:
+            return
 
         # if the new state we wanna send (state) equals
         # the current state (contact.our_chatstate) then return
diff --git a/src/gui_interface.py b/src/gui_interface.py
index 69aee1612..8b53222cd 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -416,6 +416,7 @@ class Interface:
                         account=account, name=nick, show=show)
                     ctrl = self.new_private_chat(gc_c, account, session)
 
+                ctrl.contact.our_chatstate = False
                 ctrl.print_conversation(_('Error %(code)s: %(msg)s') % {
                     'code': obj.error_code, 'msg': obj.error_msg}, 'status')
                 return