diff --git a/packages/opencode/src/cli/cmd/tui/attach.ts b/packages/opencode/src/cli/cmd/tui/attach.ts
index 561a8ced68d..3f9285f631c 100644
--- a/packages/opencode/src/cli/cmd/tui/attach.ts
+++ b/packages/opencode/src/cli/cmd/tui/attach.ts
@@ -22,11 +22,10 @@ export const AttachCommand = cmd({
       }),
   handler: async (args) => {
     if (args.dir) process.chdir(args.dir)
-    const directory = process.cwd()
     await tui({
       url: args.url,
       args: { sessionID: args.session },
-      directory,
+      directory: args.dir ? process.cwd() : undefined,
     })
   },
 })