diff --git a/addons/mail/static/src/models/message/message.js b/addons/mail/static/src/models/message/message.js
index ca1b715b399..b02cb739c20 100644
--- a/addons/mail/static/src/models/message/message.js
+++ b/addons/mail/static/src/models/message/message.js
@@ -317,8 +317,11 @@ registerModel({
             if (this.tracking_value_ids.length > 0) {
                 return false;
             }
+            if (this.message_type !== 'comment') {
+                return false;
+            }
             if (this.originThread.model === 'mail.channel') {
-                return this.message_type === 'comment';
+                return true;
             }
             return this.is_note;
         },