diff --git a/src/modes/server.rs b/src/modes/server.rs
index 44266d5..7b874c6 100644
--- a/src/modes/server.rs
+++ b/src/modes/server.rs
@@ -64,13 +64,15 @@ async fn run_server(
             ServiceBuilder::new()
                 .layer(TraceLayer::new_for_http())
                 .layer(CorsLayer::permissive())
-        )
-        .with_state(state);
+        );
     
     // Add API and documentation routes
     let app = api::add_routes(app);
     let app = docs::add_routes(app);
     
+    // Apply state to the router after all routes are added
+    let app = app.with_state(state);
+    
     let addr: SocketAddr = if config.address.starts_with('/') || config.address.starts_with("./") {
         // Unix socket - not supported by axum directly, fall back to TCP
         warn!("Unix sockets not yet implemented, falling back to TCP on 127.0.0.1:8080");
diff --git a/src/modes/server/api/mod.rs b/src/modes/server/api/mod.rs
index 50cf2d6..9bebe18 100644
--- a/src/modes/server/api/mod.rs
+++ b/src/modes/server/api/mod.rs
@@ -1,3 +1,5 @@
 pub mod item;
 pub mod status;
-pub mod routes;
+mod routes;
+
+pub use routes::add_routes;