diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4e381b9c..e354f7de 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openrouter/spawn",
-  "version": "0.11.18",
+  "version": "0.11.19",
   "type": "module",
   "bin": {
     "spawn": "cli.js"
diff --git a/packages/cli/src/__tests__/custom-flag.test.ts b/packages/cli/src/__tests__/custom-flag.test.ts
index 52d6d361..f80cdfdc 100644
--- a/packages/cli/src/__tests__/custom-flag.test.ts
+++ b/packages/cli/src/__tests__/custom-flag.test.ts
@@ -124,10 +124,9 @@ describe("Hetzner --custom prompts", () => {
     restoreEnv("HETZNER_LOCATION", savedLocation);
   });
 
-  it("promptServerType should return default in non-interactive mode", async () => {
+  it("promptServerType should return default without --custom", async () => {
     delete process.env.HETZNER_SERVER_TYPE;
     delete process.env.SPAWN_CUSTOM;
-    process.env.SPAWN_NON_INTERACTIVE = "1";
     const { promptServerType, DEFAULT_SERVER_TYPE } = await import("../hetzner/hetzner");
     const result = await promptServerType();
     expect(result).toBe(DEFAULT_SERVER_TYPE);
diff --git a/packages/cli/src/hetzner/hetzner.ts b/packages/cli/src/hetzner/hetzner.ts
index 08a7dd1d..089175ea 100644
--- a/packages/cli/src/hetzner/hetzner.ts
+++ b/packages/cli/src/hetzner/hetzner.ts
@@ -347,6 +347,10 @@ export async function promptServerType(): Promise<string> {
     return process.env.HETZNER_SERVER_TYPE;
   }
 
+  if (process.env.SPAWN_CUSTOM !== "1") {
+    return DEFAULT_SERVER_TYPE;
+  }
+
   if (process.env.SPAWN_NON_INTERACTIVE === "1") {
     return DEFAULT_SERVER_TYPE;
   }