diff --git a/src/tui/tui.ts b/src/tui/tui.ts
index ca8e3c558..b2ba32e82 100644
--- a/src/tui/tui.ts
+++ b/src/tui/tui.ts
@@ -199,7 +199,7 @@ export async function runTui(opts: TuiOptions) {
   let isConnected = false;
   let toolsExpanded = false;
   let showThinking = false;
-  const deliverDefault = opts.deliver ?? true;
+  const deliverDefault = opts.deliver ?? false;
   const autoMessage = opts.message?.trim();
   let autoMessageSent = false;
   let sessionInfo: SessionInfo = {};
diff --git a/src/wizard/onboarding.ts b/src/wizard/onboarding.ts
index 9b60b4092..daf3cd4e9 100644
--- a/src/wizard/onboarding.ts
+++ b/src/wizard/onboarding.ts
@@ -796,6 +796,8 @@ export async function runOnboardingWizard(
           token: authMode === "token" ? gatewayToken : undefined,
           password:
             authMode === "password" ? baseConfig.gateway?.auth?.password : "",
+          // Safety: onboarding TUI should not auto-deliver to lastProvider/lastTo.
+          deliver: false,
           message: "Wake up, my friend!",
         });
       }