diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index f661d0a47..656208585 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -1123,9 +1123,9 @@ function _Chat() {
                               10,
                             );
                             chatStore.updateCurrentSession((session) => {
-                              const m = session.messages.find(
-                                (m) => m.id === message.id,
-                              );
+                              const m = session.mask.context
+                                .concat(session.messages)
+                                .find((m) => m.id === message.id);
                               if (m) {
                                 m.content = newMessage;
                               }