diff --git a/dist/index.js b/dist/index.js
index b9156bec..7c8fbf6a 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2447,9 +2447,7 @@
       chatModel.chatMessageHandlerManager.addHandler(
         (chatMessage) => {
           this.messagePageViewModel.showChatMessage(chatMessage);
-          if (this.chatListViewModel.selectedChat.value != this) {
-            this.hasUnreadMessages.value = true;
-          }
+          this.markUnread();
         }
       );
       this.loadPageSelection();
diff --git a/src/ViewModel/Chat/chatViewModel.ts b/src/ViewModel/Chat/chatViewModel.ts
index 5d162918..33e51f40 100644
--- a/src/ViewModel/Chat/chatViewModel.ts
+++ b/src/ViewModel/Chat/chatViewModel.ts
@@ -133,10 +133,7 @@ export default class ChatViewModel {
     chatModel.chatMessageHandlerManager.addHandler(
       (chatMessage: ChatMessage) => {
         this.messagePageViewModel.showChatMessage(chatMessage);
-        
-        if (this.chatListViewModel.selectedChat.value != this) {
-          this.hasUnreadMessages.value = true;
-        }
+        this.markUnread();
       }
     );