diff --git a/web/src/message_list_tooltips.ts b/web/src/message_list_tooltips.ts
index 6081d3db54..5abe9e111f 100644
--- a/web/src/message_list_tooltips.ts
+++ b/web/src/message_list_tooltips.ts
@@ -364,15 +364,16 @@ export function initialize(): void {
         },
         onShow(instance) {
             const $elem = $(instance.reference);
-            assert(message_lists.current !== undefined);
             const message_id = Number($elem.closest(".message_row").attr("data-message-id"));
+
+            assert(message_lists.current !== undefined);
             const message_container = message_lists.current.view.message_containers.get(message_id);
             assert(message_container !== undefined);
             const last_edit_timestr = get_last_edit_timestr(message_container.msg);
             instance.setContent(
                 parse_html(
                     render_message_edit_notice_tooltip({
-                        message_container,
+                        moved: message_container.moved,
                         last_edit_timestr,
                         realm_allow_edit_history: realm.realm_allow_edit_history,
                     }),
diff --git a/web/templates/message_edit_notice_tooltip.hbs b/web/templates/message_edit_notice_tooltip.hbs
index 9f0f6418ff..ca9e500914 100644
--- a/web/templates/message_edit_notice_tooltip.hbs
+++ b/web/templates/message_edit_notice_tooltip.hbs
@@ -1,11 +1,15 @@
 <div>
-    <div>{{t "View edit history"}}</div>
     {{#if realm_allow_edit_history}}
-        {{#if message_container/moved}}
-            <div class="tooltip-inner-content italic">{{t 'Last moved {last_edit_timestr}.'}}</div>
-        {{else}}
-            <div class="tooltip-inner-content italic">{{t 'Last edited {last_edit_timestr}.'}}</div>
-        {{/if}}
+    <div>{{t "View edit history"}}</div>
     {{/if}}
+    <div class="tooltip-inner-content italic">
+        {{#if moved}}
+        {{t 'Last moved {last_edit_timestr}.'}}
+        {{else}}
+        {{t 'Last edited {last_edit_timestr}.'}}
+        {{/if}}
+    </div>
 </div>
+{{#if realm_allow_edit_history}}
 {{tooltip_hotkey_hints "Shift" "H"}}
+{{/if}}