From de2efb290b6277b04d7144ecedc172b69a315ec7 Mon Sep 17 00:00:00 2001
From: Nathan Flurry <developer@nathanflurry.com>
Date: Mon, 13 Oct 2025 11:23:37 -0700
Subject: [PATCH] fix(core): do not redirect client endpoint if default server
 disabled

---
 packages/rivetkit/src/common/router.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/rivetkit/src/common/router.ts b/packages/rivetkit/src/common/router.ts
index 94e6dd3db..b88c1c8d5 100644
--- a/packages/rivetkit/src/common/router.ts
+++ b/packages/rivetkit/src/common/router.ts
@@ -115,7 +115,10 @@ export function handleMetadataRequest(c: HonoContext, runConfig: RunnerConfig) {
 					? { serverless: {} }
 					: { normal: {} },
 		},
-		clientEndpoint: getEndpoint(runConfig),
+		// Do not return client endpoint if default server disabled
+		clientEndpoint:
+			runConfig.overrideServerAddress ??
+			(runConfig.disableDefaultServer ? undefined : getEndpoint(runConfig)),
 	};
 
 	return c.json(response);