diff --git a/app/components/chat/ImportFolderButton.tsx b/app/components/chat/ImportFolderButton.tsx
index 70e9f1f..e766a71 100644
--- a/app/components/chat/ImportFolderButton.tsx
+++ b/app/components/chat/ImportFolderButton.tsx
@@ -54,10 +54,10 @@ export const ImportFolderButton: React.FC<ImportFolderButtonProps> = ({ classNam
         toast.info(`Skipping ${binaryFilePaths.length} binary files`);
       }
 
-      const { userMessage, assistantMessage } = await createChatFromFolder(textFiles, binaryFilePaths, folderName);
+      const messages = await createChatFromFolder(textFiles, binaryFilePaths, folderName);
 
       if (importChat) {
-        await importChat(folderName, [userMessage, assistantMessage]);
+        await importChat(folderName, [...messages]);
       }
 
       toast.success('Folder imported successfully');