diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index d2fe26d1c3..f308ae9af0 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -2805,7 +2805,7 @@ def check_update_message(
     ):
         deadline_seconds = Realm.DEFAULT_COMMUNITY_TOPIC_EDITING_LIMIT_SECONDS + edit_limit_buffer
         if (timezone_now() - message.date_sent) > datetime.timedelta(seconds=deadline_seconds):
-            raise JsonableError(_("The time limit for editing this message has passed"))
+            raise JsonableError(_("The time limit for editing this message's topic has passed"))
 
     rendered_content = None
     links_for_embed: Set[str] = set()
diff --git a/zerver/tests/test_message_edit.py b/zerver/tests/test_message_edit.py
index 78ecc22759..ac65146a77 100644
--- a/zerver/tests/test_message_edit.py
+++ b/zerver/tests/test_message_edit.py
@@ -879,7 +879,7 @@ class EditMessageTest(EditMessageTestCase):
         set_message_editing_params(True, 0, True)
         do_edit_message_assert_success(id_, "E")
         self.login("cordelia")
-        do_edit_message_assert_error(id_, "F", "The time limit for editing this message has passed")
+        do_edit_message_assert_error(id_, "F", "The time limit for editing this message's topic has passed")
 
         # anyone should be able to edit "no topic" indefinitely
         message.set_topic_name("(no topic)")