diff --git a/web/src/message_edit.js b/web/src/message_edit.js
index ba99af5ca1..bcfe9d8945 100644
--- a/web/src/message_edit.js
+++ b/web/src/message_edit.js
@@ -907,14 +907,17 @@ export function save_message_row_edit($row) {
         changed = old_content !== new_content;
     }
 
-    const wildcard_mention = util.find_wildcard_mentions(new_content);
-    const is_stream_message_mentions_valid = compose_validate.validate_stream_message_mentions(
-        stream_id,
-        $banner_container,
-        wildcard_mention,
-    );
-    if (!is_stream_message_mentions_valid) {
-        return;
+    const already_has_wildcard_mention = message.wildcard_mentioned;
+    if (!already_has_wildcard_mention) {
+        const wildcard_mention = util.find_wildcard_mentions(new_content);
+        const is_stream_message_mentions_valid = compose_validate.validate_stream_message_mentions(
+            stream_id,
+            $banner_container,
+            wildcard_mention,
+        );
+        if (!is_stream_message_mentions_valid) {
+            return;
+        }
     }
 
     show_message_edit_spinner($row);