diff --git a/src/commands/configure.gateway.ts b/src/commands/configure.gateway.ts
index 7ddfce3b6..3313b37ca 100644
--- a/src/commands/configure.gateway.ts
+++ b/src/commands/configure.gateway.ts
@@ -175,7 +175,7 @@ export async function promptGatewayConfig(
       }),
       runtime,
     );
-    gatewayToken = String(tokenInput).trim() || randomToken();
+    gatewayToken = (tokenInput ?? "").trim() || randomToken();
   }
 
   if (authMode === "password") {
diff --git a/src/wizard/onboarding.gateway-config.ts b/src/wizard/onboarding.gateway-config.ts
index 1a097f42e..7d36ebae0 100644
--- a/src/wizard/onboarding.gateway-config.ts
+++ b/src/wizard/onboarding.gateway-config.ts
@@ -180,7 +180,7 @@ export async function configureGatewayForOnboarding(
         placeholder: "Needed for multi-machine or non-loopback access",
         initialValue: quickstartGateway.token ?? "",
       });
-      gatewayToken = String(tokenInput).trim() || randomToken();
+      gatewayToken = (tokenInput ?? "").trim() || randomToken();
     }
   }