diff --git a/src/components/chat_view/chat_view.js b/src/components/chat_view/chat_view.js
index 784af9ad3..75ab21dd5 100644
--- a/src/components/chat_view/chat_view.js
+++ b/src/components/chat_view/chat_view.js
@@ -457,10 +457,16 @@ const Chat = {
 
         // Sanity check
         if (!this.isConversation && message.chat_id !== this.chat.id) {
+          // This is spammy, we get chat updates from a global chat update
+          // handler, which naturally receives updates for ALL chats.
+          // There is no way to subscribe to specific chat updates and listen
+          // to that in the API.
+          /*
           console.warn(
             `Chat message doesn't belong to current chat (id: ${this.chat.id})!!`,
             message,
           )
+          */
           return
         }