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);