diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx
index b1d14ea0e..1a33375d6 100644
--- a/app/components/chat/BaseChat.tsx
+++ b/app/components/chat/BaseChat.tsx
@@ -365,7 +365,7 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
                           </>
                         )}
                       </IconButton>
-                      <ClientOnly>{() => <ExportChatButton exportChat={exportChat} />}</ClientOnly>
+                      {chatStarted && <ClientOnly>{() => <ExportChatButton exportChat={exportChat} />}</ClientOnly>}
                     </div>
                     {input.length > 3 ? (
                       <div className="text-xs text-bolt-elements-textTertiary">
diff --git a/app/components/chat/ExportChatButton.tsx b/app/components/chat/ExportChatButton.tsx
index 8972eed1b..6ab294bc1 100644
--- a/app/components/chat/ExportChatButton.tsx
+++ b/app/components/chat/ExportChatButton.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 export const ExportChatButton = ({ exportChat }: { exportChat?: () => void }) => {
   return (
     <WithTooltip tooltip="Export Chat">
-      <IconButton title="Export Chat" onClick={exportChat}>
+      <IconButton title="Export Chat" onClick={() => exportChat?.()}>
         <div className="i-ph:download-simple text-xl"></div>
       </IconButton>
     </WithTooltip>