diff --git a/src/components/MessageInput/MessageInputFlat.tsx b/src/components/MessageInput/MessageInputFlat.tsx
index b8a674dad..25a1393bc 100644
--- a/src/components/MessageInput/MessageInputFlat.tsx
+++ b/src/components/MessageInput/MessageInputFlat.tsx
@@ -49,6 +49,7 @@ export const MessageInputFlat = <
     maxFilesLeft,
     message,
     numberOfUploads,
+    parent,
     recordingController,
     setCooldownRemaining,
     text,
@@ -129,7 +130,7 @@ export const MessageInputFlat = <
 
   // TODO: "!message" condition is a temporary fix for shared
   // state when editing a message (fix shared state issue)
-  const displayQuotedMessage = !message && quotedMessage && !quotedMessage.parent_id;
+  const displayQuotedMessage = !message && quotedMessage && quotedMessage.parent_id === parent?.id;
   const recordingEnabled = !!(recordingController.recorder && navigator.mediaDevices); // account for requirement on iOS as per this bug report: https://bugs.webkit.org/show_bug.cgi?id=252303
   const isRecording = !!recordingController.recordingState;