diff --git a/client/src/hooks/Chat/useChatFunctions.ts b/client/src/hooks/Chat/useChatFunctions.ts
index 666973a1a5..829f20dca9 100644
--- a/client/src/hooks/Chat/useChatFunctions.ts
+++ b/client/src/hooks/Chat/useChatFunctions.ts
@@ -215,18 +215,17 @@ export default function useChatFunctions({
       submissionFiles.length > 0;
 
     if (setFiles && reuseFiles === true) {
-      currentMsg.files = submissionFiles;
+      currentMsg.files = [...submissionFiles];
       setFiles(new Map());
       setFilesToDelete({});
     } else if (setFiles && files && files.size > 0) {
-      const chatFiles = Array.from(files.values()).map((file) => ({
+      currentMsg.files = Array.from(files.values()).map((file) => ({
         file_id: file.file_id,
         filepath: file.filepath,
         type: file.type ?? '', // Ensure type is not undefined
         height: file.height,
         width: file.width,
       }));
-      currentMsg.files = chatFiles;
       setFiles(new Map());
       setFilesToDelete({});
     }