diff --git a/rivetkit-typescript/packages/rivetkit/src/registry/index.ts b/rivetkit-typescript/packages/rivetkit/src/registry/index.ts
index 3a64d4f916..b852536d25 100644
--- a/rivetkit-typescript/packages/rivetkit/src/registry/index.ts
+++ b/rivetkit-typescript/packages/rivetkit/src/registry/index.ts
@@ -59,17 +59,13 @@ export class Registry<A extends RegistryActors> {
 		const config = this.parseConfig();
 		this.#printWelcome(config, "serverless");
 
-		if (config.configurePool && !this.#configureServerlessPoolPromise) {
-			this.#configureServerlessPoolPromise =
-				configureServerlessPool(config);
-		}
-
 		if (!this.#runtimeServerlessPromise) {
 			this.#runtimeServerlessPromise = buildConfiguredRegistry(config);
 		}
 
 		const { runtime, registry, serveConfig } =
 			await this.#runtimeServerlessPromise;
+
 		const cancelToken = runtime.createCancellationToken();
 		const abort = () => runtime.cancelCancellationToken(cancelToken);
 		if (request.signal.aborted) {
@@ -196,6 +192,12 @@ export class Registry<A extends RegistryActors> {
 			throw err;
 		}
 
+		if (config.configurePool && !this.#configureServerlessPoolPromise) {
+			this.#configureServerlessPoolPromise =
+				configureServerlessPool(config);
+		}
+		await this.#configureServerlessPoolPromise;
+
 		return new Response(stream, {
 			status: head.status,
 			headers: head.headers,
diff --git a/rivetkit-typescript/packages/rivetkit/src/serverless/configure.ts b/rivetkit-typescript/packages/rivetkit/src/serverless/configure.ts
index 63baf10317..8b2b866101 100644
--- a/rivetkit-typescript/packages/rivetkit/src/serverless/configure.ts
+++ b/rivetkit-typescript/packages/rivetkit/src/serverless/configure.ts
@@ -3,66 +3,90 @@ import {
 	getDatacenters,
 	updateRunnerConfig,
 } from "@/engine-client/api-endpoints";
+import { stringifyError } from "@/common/utils";
 import type { RegistryConfig } from "@/registry/config";
 import { logger } from "@/registry/log";
 
+const CONFIGURE_POOL_MAX_ATTEMPTS = 30;
+const CONFIGURE_POOL_RETRY_INTERVAL_MS = 1000;
+
 export async function configureServerlessPool(
 	config: RegistryConfig,
 ): Promise<void> {
 	logger().debug({ msg: "configuring serverless pool" });
 
-	try {
-		if (!config.namespace) {
-			throw new Error("namespace is required for serverless configuration");
-		}
-		if (!config.endpoint) {
-			throw new Error("endpoint is required for serverless configuration");
-		}
-		if (!config.configurePool) {
-			throw new Error("configurePool is required for serverless configuration");
+	for (let attempt = 1; attempt <= CONFIGURE_POOL_MAX_ATTEMPTS; attempt++) {
+		try {
+			await configureServerlessPoolOnce(config);
+			return;
+		} catch (error) {
+			if (attempt === CONFIGURE_POOL_MAX_ATTEMPTS) {
+				logger().error({
+					msg: "failed to configure serverless pool, validate endpoint is configured correctly then restart this process",
+					errorMessage: stringifyError(error),
+				});
+				throw error;
+			}
+
+			logger().warn({
+				msg: "serverless pool configuration failed, retrying",
+				attempt,
+				maxAttempts: CONFIGURE_POOL_MAX_ATTEMPTS,
+				errorMessage: stringifyError(error),
+			});
+			await new Promise((resolve) =>
+				setTimeout(resolve, CONFIGURE_POOL_RETRY_INTERVAL_MS),
+			);
 		}
+	}
+}
 
-		const customConfig = config.configurePool;
-		const clientConfig = convertRegistryConfigToClientConfig(config);
-		const dcsRes = await getDatacenters(clientConfig);
-		const poolName = customConfig.name ?? "default";
-		const headers = {
-			...(config.token ? { "x-rivet-token": config.token } : {}),
-			...(customConfig.headers ?? {}),
-		};
-		const serverlessConfig = {
-			serverless: {
-				url: customConfig.url,
-				headers,
-				request_lifespan: customConfig.requestLifespan ?? 15 * 60,
-				drain_grace_period: customConfig.drainGracePeriod,
-				metadata_poll_interval:
-					customConfig.metadataPollInterval ?? 1000,
-				max_runners: 100_000,
-				min_runners: 0,
-				runners_margin: 0,
-				slots_per_runner: 1,
-			},
-			metadata: customConfig.metadata ?? {},
-			drain_on_version_upgrade:
-				customConfig.drainOnVersionUpgrade ?? true,
-		};
+async function configureServerlessPoolOnce(
+	config: RegistryConfig,
+): Promise<void> {
+	if (!config.namespace) {
+		throw new Error("namespace is required for serverless configuration");
+	}
+	if (!config.endpoint) {
+		throw new Error("endpoint is required for serverless configuration");
+	}
+	if (!config.configurePool) {
+		throw new Error("configurePool is required for serverless configuration");
+	}
 
-		await updateRunnerConfig(clientConfig, poolName, {
-			datacenters: Object.fromEntries(
-				dcsRes.datacenters.map((dc) => [dc.name, serverlessConfig]),
-			),
-		});
+	const customConfig = config.configurePool;
+	const clientConfig = convertRegistryConfigToClientConfig(config);
+	const dcsRes = await getDatacenters(clientConfig);
+	const poolName = customConfig.name ?? "default";
+	const headers = {
+		...(config.token ? { "x-rivet-token": config.token } : {}),
+		...(customConfig.headers ?? {}),
+	};
+	const serverlessConfig = {
+		serverless: {
+			url: customConfig.url,
+			headers,
+			request_lifespan: customConfig.requestLifespan ?? 15 * 60,
+			drain_grace_period: customConfig.drainGracePeriod,
+			metadata_poll_interval: customConfig.metadataPollInterval ?? 1000,
+			max_runners: 100_000,
+			min_runners: 0,
+			runners_margin: 0,
+			slots_per_runner: 1,
+		},
+		metadata: customConfig.metadata ?? {},
+		drain_on_version_upgrade: customConfig.drainOnVersionUpgrade ?? true,
+	};
 
-		logger().info({
-			msg: "serverless pool configured successfully",
-			poolName,
-			namespace: config.namespace,
-		});
-	} catch (error) {
-		logger().error({
-			msg: "failed to configure serverless pool, validate endpoint is configured correctly then restart this process",
-			error,
-		});
-	}
+	await updateRunnerConfig(clientConfig, poolName, {
+		datacenters: Object.fromEntries(
+			dcsRes.datacenters.map((dc) => [dc.name, serverlessConfig]),
+		),
+	});
+
+	logger().info({
+		msg: "serverless pool configured successfully",
+		poolName,
+		namespace: config.namespace,
+	});
 }