diff --git a/rivetkit-typescript/packages/rivetkit/src/registry/run-config.ts b/rivetkit-typescript/packages/rivetkit/src/registry/run-config.ts
index 46e01c96c1..dfcc7d8d5e 100644
--- a/rivetkit-typescript/packages/rivetkit/src/registry/run-config.ts
+++ b/rivetkit-typescript/packages/rivetkit/src/registry/run-config.ts
@@ -32,7 +32,15 @@ const RunnerConfigSchemaUnmerged = z
 		disableDefaultServer: z.boolean().optional().default(false),
 
 		/** @experimental */
-		defaultServerPort: z.number().default(6420),
+		defaultServerPort: z
+			.number()
+			.default(() => {
+				const defaultPort = getEnvUniversal("RIVET_SERVER_PORT");
+				if (typeof defaultPort === "undefined") {
+					return 6420;
+				}
+				return parseInt(defaultPort);
+			}),
 
 		/** @experimental */
 		runEngine: z