diff --git a/native/chat/chat-input-bar.react.js b/native/chat/chat-input-bar.react.js
--- a/native/chat/chat-input-bar.react.js
+++ b/native/chat/chat-input-bar.react.js
@@ -838,7 +838,9 @@
 
   isEditMode = () => {
     const editState = this.props.inputState?.editState;
-    return editState && editState.editedMessage !== null;
+    const isThisThread =
+      editState?.editedMessage?.threadID === this.props.threadInfo.id;
+    return editState && editState.editedMessage !== null && isThisThread;
   };
 
   isMessageEdited = () => {
diff --git a/native/chat/composed-message.react.js b/native/chat/composed-message.react.js
--- a/native/chat/composed-message.react.js
+++ b/native/chat/composed-message.react.js
@@ -304,8 +304,12 @@
     const deliveryIconOpacity = useDeliveryIconOpacity(props.item);
     const shouldRenderAvatars = useShouldRenderAvatars();
     const progress = useDerivedValue(() => {
+      const isThisThread =
+        inputState?.editState.editedMessage?.threadID ===
+        props.item.threadInfo.id;
       const isHighlighted =
-        inputState?.editState.editedMessage?.id === props.item.messageInfo.id;
+        inputState?.editState.editedMessage?.id === props.item.messageInfo.id &&
+        isThisThread;
       return withTiming(isHighlighted ? 1 : 0);
     });
     const editedMessageStyle = useAnimatedStyle(() => {