diff --git a/source/org/jivesoftware/smackx/ChatStateManager.java b/source/org/jivesoftware/smackx/ChatStateManager.java
index 70d07fef9..325cf03c5 100644
--- a/source/org/jivesoftware/smackx/ChatStateManager.java
+++ b/source/org/jivesoftware/smackx/ChatStateManager.java
@@ -144,8 +144,8 @@ public class ChatStateManager {
 
     private boolean updateChatState(Chat chat, ChatState newState) {
         ChatState lastChatState = chatStates.get(chat);
-        if (lastChatState == null || lastChatState != newState) {
-            chatStates.put(chat, lastChatState);
+        if (lastChatState != newState) {
+            chatStates.put(chat, newState);
             return true;
         }
         return false;