diff --git a/package/src/contexts/messageInputContext/hooks/useCreateMessageComposer.ts b/package/src/contexts/messageInputContext/hooks/useCreateMessageComposer.ts
index c44507566c..418d447213 100644
--- a/package/src/contexts/messageInputContext/hooks/useCreateMessageComposer.ts
+++ b/package/src/contexts/messageInputContext/hooks/useCreateMessageComposer.ts
@@ -38,7 +38,10 @@ export const useCreateMessageComposer = ({
       const tag = MessageComposer.constructTag(cachedEditedMessage);
 
       const cachedComposer = queueCache.get(tag);
-      if (cachedComposer) return cachedComposer;
+      if (cachedComposer) {
+        cachedComposer.editedMessage = cachedEditedMessage;
+        return cachedComposer;
+      }
 
       return new MessageComposer({
         client,