diff --git a/src/gajim.py b/src/gajim.py
index 8275a48a3e416115258cbf0d1e50f18b959fc68d..cc707f3ccb87e45f89fd01a01b12184217daf881 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -386,7 +386,7 @@ class Interface:
 					contact.chatstate = 'active' # no more
 				
 				chat_win.handle_incoming_chatstate(account, jid, chatstate)
-			else:
+			elif contact.chatstate != 'active':
 				# got no valid jep85 answer, peer does not support it
 				contact.chatstate = False
 		else: