diff --git a/packages/core/pegboard-serverless/src/lib.rs b/packages/core/pegboard-serverless/src/lib.rs
index af731325c9..73a83904c8 100644
--- a/packages/core/pegboard-serverless/src/lib.rs
+++ b/packages/core/pegboard-serverless/src/lib.rs
@@ -242,17 +242,26 @@ async fn outbound_handler(
 				v.parse::<HeaderValue>().ok()?,
 			))
 		})
+		.chain(std::iter::once((
+			X_RIVETKIT_TOTAL_SLOTS,
+			HeaderValue::try_from(slots_per_runner)?,
+		)))
+		// Add token if auth is enabled
+		.chain(
+			ctx.config()
+				.auth
+				.as_ref()
+				.map(|auth| {
+					anyhow::Ok((
+						X_RIVET_TOKEN,
+						HeaderValue::try_from(auth.admin_token.read())?,
+					))
+				})
+				.transpose()?,
+		)
 		.collect();
 
-	let mut req = client
-		.get(url)
-		.headers(headers)
-		.header(X_RIVETKIT_TOTAL_SLOTS, slots_per_runner.to_string());
-
-	// Add admin token if configured
-	if let Some(auth) = &ctx.config().auth {
-		req = req.header(X_RIVET_TOKEN, auth.admin_token.read());
-	}
+	let mut req = client.get(url).headers(headers);
 
 	let mut source = sse::EventSource::new(req).context("failed creating event source")?;
 	let mut runner_id = None;
diff --git a/packages/services/namespace/src/ops/resolve_for_name_global.rs b/packages/services/namespace/src/ops/resolve_for_name_global.rs
index c7d85d5fd1..51d451f563 100644
--- a/packages/services/namespace/src/ops/resolve_for_name_global.rs
+++ b/packages/services/namespace/src/ops/resolve_for_name_global.rs
@@ -31,7 +31,11 @@ pub async fn namespace_resolve_for_name_global(
 					let client = client.clone();
 					async move {
 						let url = leader_dc.api_peer_url.join(&format!("/namespaces"))?;
-						let res = client.get(url).query(&[("name", &input.name)]).send().await?;
+						let res = client
+							.get(url)
+							.query(&[("name", &input.name)])
+							.send()
+							.await?;
 
 						let res = rivet_api_util::parse_response::<
 							rivet_api_types::namespaces::list::ListResponse,