diff --git a/Sources/ChatUI/ChatInChannel/MessageList.swift b/Sources/ChatUI/ChatInChannel/MessageList.swift
index 797a20c..f93e036 100644
--- a/Sources/ChatUI/ChatInChannel/MessageList.swift
+++ b/Sources/ChatUI/ChatInChannel/MessageList.swift
@@ -184,7 +184,7 @@ public struct MessageList<MessageType: MessageProtocol & Identifiable, RowConten
             }
         }
         .onReceive(highlightMessagePublisher) { highlightMessage in
-            if let highlightMessage = highlightMessage as? MessageType {
+            if let highlightMessage = highlightMessage as? MessageType, messageMenuContent != nil {
                 self.highlightMessage = highlightMessage
                 withAnimation(.easeInOut) {
                     self.isMessageMenuPresented = true