diff --git a/web/src/message_events.js b/web/src/message_events.js
index c53c2822ad..d74d4fd61f 100644
--- a/web/src/message_events.js
+++ b/web/src/message_events.js
@@ -381,9 +381,14 @@ export function update_messages(events) {
         const stream_archived = old_stream === undefined;
 
         if (!topic_edited && !stream_changed) {
-            // If the topic or stream of the message was changed,
+            // If the topic or stream of the anchor message was changed,
             // it will be rerendered if present in any rendered list.
-            messages_to_rerender.push(anchor_message);
+            //
+            // But for content edits, we need to schedule it to be
+            // rerendered, if we have a local copy of it.
+            if (anchor_message !== undefined) {
+                messages_to_rerender.push(anchor_message);
+            }
         } else {
             const going_forward_change = ["change_later", "change_all"].includes(
                 event.propagate_mode,