diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index 022f2df155..df3556efd3 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -5564,7 +5564,7 @@ def do_update_message(
     if propagate_mode in ["change_later", "change_all"]:
         assert topic_name is not None or new_stream is not None
         messages_list = update_messages_for_topic_edit(
-            message=message,
+            edited_message=message,
             propagate_mode=propagate_mode,
             orig_topic_name=orig_topic_name,
             topic_name=topic_name,
diff --git a/zerver/lib/topic.py b/zerver/lib/topic.py
index aca3beb8ef..9fc33ed55c 100644
--- a/zerver/lib/topic.py
+++ b/zerver/lib/topic.py
@@ -127,7 +127,7 @@ def user_message_exists_for_topic(
 
 
 def update_messages_for_topic_edit(
-    message: Message,
+    edited_message: Message,
     propagate_mode: str,
     orig_topic_name: str,
     topic_name: Optional[str],
@@ -141,13 +141,13 @@ def update_messages_for_topic_edit(
     if old_recipient_id is not None:
         recipient_id = old_recipient_id
     else:
-        recipient_id = message.recipient_id
+        recipient_id = edited_message.recipient_id
 
     propagate_query = Q(recipient_id=recipient_id, subject__iexact=orig_topic_name)
     if propagate_mode == "change_all":
-        propagate_query = propagate_query & ~Q(id=message.id)
+        propagate_query = propagate_query & ~Q(id=edited_message.id)
     if propagate_mode == "change_later":
-        propagate_query = propagate_query & Q(id__gt=message.id)
+        propagate_query = propagate_query & Q(id__gt=edited_message.id)
 
     messages = Message.objects.filter(propagate_query).select_related()