diff --git a/apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift b/apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift
index 2573dceb1..d88f108e7 100644
--- a/apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift
+++ b/apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift
@@ -262,12 +262,10 @@ actor GatewayEndpointStore {
         tailscaleIP: String?) -> String
     {
         switch bindMode {
-        case "tailnet":
-            return tailscaleIP ?? "127.0.0.1"
-        case "auto":
-            return tailscaleIP ?? "127.0.0.1"
+        case "tailnet", "auto":
+            tailscaleIP ?? "127.0.0.1"
         default:
-            return "127.0.0.1"
+            "127.0.0.1"
         }
     }
 }
diff --git a/src/auto-reply/reply/commands.ts b/src/auto-reply/reply/commands.ts
index 19328b0c0..638f4d369 100644
--- a/src/auto-reply/reply/commands.ts
+++ b/src/auto-reply/reply/commands.ts
@@ -297,7 +297,7 @@ export async function handleCommands(params: {
       : undefined;
     const statusText = buildStatusMessage({
       agent: {
-        ...(cfg.agent ?? {}),
+        ...cfg.agent,
         model,
         contextTokens,
         thinkingDefault: cfg.agent?.thinkingDefault,