diff --git a/crates/client-api/src/routes/database.rs b/crates/client-api/src/routes/database.rs
index cacf7ab0557..e1464814656 100644
--- a/crates/client-api/src/routes/database.rs
+++ b/crates/client-api/src/routes/database.rs
@@ -292,7 +292,7 @@ async fn find_leader_and_database<S: ControlStateDelegate + NodeDelegate>(
             NO_SUCH_DATABASE
         })?;
 
-    let leader = worker_ctx.leader(database.id).await.map_err(log_and_500)?;
+    let leader = worker_ctx.leader(database.id).await.map_err(Into::into)?;
 
     Ok((leader, database))
 }
diff --git a/crates/client-api/src/routes/subscribe.rs b/crates/client-api/src/routes/subscribe.rs
index 6602d34d9a5..e2131abfa31 100644
--- a/crates/client-api/src/routes/subscribe.rs
+++ b/crates/client-api/src/routes/subscribe.rs
@@ -202,7 +202,7 @@ where
         .map_err(log_and_500)?
         .ok_or(StatusCode::NOT_FOUND)?;
 
-    let leader = ctx.leader(database.id).await.map_err(log_and_500)?;
+    let leader = ctx.leader(database.id).await.map_err(Into::into)?;
 
     let identity_token = auth.creds.token().into();