diff --git a/packages/rivetkit/src/manager/router.ts b/packages/rivetkit/src/manager/router.ts
index ee9348e51..dac073a3e 100644
--- a/packages/rivetkit/src/manager/router.ts
+++ b/packages/rivetkit/src/manager/router.ts
@@ -105,7 +105,7 @@ export function createManagerRouter(
 }
 
 function addServerlessRoutes(
-	serverlessActorDriverBuilder: () => ActorDriver,
+	serverlessActorDriverBuilder: (token: string | undefined) => ActorDriver,
 	router: OpenAPIHono,
 	cors: MiddlewareHandler,
 ) {
@@ -118,7 +118,7 @@ function addServerlessRoutes(
 
 	// Serverless start endpoint
 	router.get("/start", cors, async (c) => {
-		const actorDriver = serverlessActorDriverBuilder();
+		const actorDriver = serverlessActorDriverBuilder(c.req.header("x-rivet-token"));
 		invariant(
 			actorDriver.serverlessHandleStart,
 			"missing serverlessHandleStart on ActorDriver",
@@ -169,9 +169,9 @@ function addManagerRoutes(
 
 			const actorIdsParsed = actor_ids
 				? actor_ids
-						.split(",")
-						.map((id) => id.trim())
-						.filter((id) => id.length > 0)
+					.split(",")
+					.map((id) => id.trim())
+					.filter((id) => id.length > 0)
 				: undefined;
 
 			const actors: ActorOutput[] = [];
diff --git a/packages/rivetkit/src/registry/mod.ts b/packages/rivetkit/src/registry/mod.ts
index 7c4ed7d03..2bf636dfd 100644
--- a/packages/rivetkit/src/registry/mod.ts
+++ b/packages/rivetkit/src/registry/mod.ts
@@ -215,7 +215,10 @@ export class Registry<A extends RegistryActors> {
 			console.log();
 		}
 
-		let serverlessActorDriverBuilder: (() => ActorDriver) | undefined = () => {
+		let serverlessActorDriverBuilder: ((token?: string) => ActorDriver) | undefined = (token: string | undefined) => {
+			// Override config token if one was set
+			if (token) config.token = token;
+
 			return driver.actor(this.#config, config, managerDriver, client);
 		};