diff --git a/crates/tabby/src/serve.rs b/crates/tabby/src/serve.rs
index a439cf8..2668f5a 100644
--- a/crates/tabby/src/serve.rs
+++ b/crates/tabby/src/serve.rs
@@ -119,6 +119,10 @@ pub async fn main(config: &Config, args: &ServeArgs) {
     #[cfg(not(feature = "ee"))]
     let app = app.fallback(|| async { axum::response::Redirect::permanent("/swagger-ui") });
 
+    let app = app
+        .layer(CorsLayer::permissive())
+        .layer(opentelemetry_tracing_layer());
+
     let address = SocketAddr::from((Ipv4Addr::UNSPECIFIED, args.port));
     info!("Listening at {}", address);
 
@@ -224,8 +228,7 @@ async fn api_router(
     for router in routers {
         root = root.merge(router);
     }
-    root.layer(CorsLayer::permissive())
-        .layer(opentelemetry_tracing_layer())
+    root
 }
 
 fn start_heartbeat(args: &ServeArgs) {
diff --git a/crates/tabby/src/worker.rs b/crates/tabby/src/worker.rs
index fc58e3f..f874a21 100644
--- a/crates/tabby/src/worker.rs
+++ b/crates/tabby/src/worker.rs
@@ -6,9 +6,11 @@ use std::{
 
 use anyhow::Result;
 use axum::{routing, Router};
+use axum_tracing_opentelemetry::opentelemetry_tracing_layer;
 use clap::Args;
 use hyper::Server;
 use tabby_webserver::api::{tracing_context, HubClient, WorkerKind};
+use tower_http::cors::CorsLayer;
 use tracing::{info, warn};
 
 use crate::{
@@ -87,6 +89,10 @@ pub async fn main(kind: WorkerKind, args: &WorkerArgs) {
         WorkerKind::Chat => make_chat_route(context, args).await,
     };
 
+    let app = app
+        .layer(CorsLayer::permissive())
+        .layer(opentelemetry_tracing_layer());
+
     let address = SocketAddr::from((Ipv4Addr::UNSPECIFIED, args.port));
     info!("Listening at {}", address);