diff --git a/src/components/ChatPane.tsx b/src/components/ChatPane.tsx
index 59f79cd..5fa1ab0 100644
--- a/src/components/ChatPane.tsx
+++ b/src/components/ChatPane.tsx
@@ -193,9 +193,9 @@ export function ChatPane({ session, cfg, messages, onSend, onStop, onRename }: P
   const renderedHtml = useMemo(() =>
     messages.map(msg =>
       (msg.role === 'user' || msg.role === 'assistant')
-        ? linkifyPaths((marked.parse(msg.content) as string), session.cwd ?? '')
+        ? linkifyPaths((marked.parse(msg.content) as string), cfg?.cwd ?? '')
         : ''),
-    [messages, session.cwd]
+    [messages, cfg?.cwd]
   )
 
   const startRename = () => { setRenaming(true); setRenameVal(sid) }
@@ -226,7 +226,7 @@ export function ChatPane({ session, cfg, messages, onSend, onStop, onRename }: P
           <div class={`state-dot ${stateClass(state)}`} style="margin-right: 2px;" />
           <span class="badge accent">{cfg.backend ?? session.backend}</span>
           <span class="badge">{truncate(cfg.model ?? session.model, 24)}</span>
-          <span class="badge dim" title={session.cwd}>{session.cwd}</span>
+          <span class="badge dim" title={cfg.cwd}>{cfg.cwd}</span>
           {cfg.agent && cfg.agent !== 'default' && (
             <span class="badge warn">{cfg.agent}</span>
           )}