diff --git a/Cargo.lock b/Cargo.lock
index ddd825a..ac4e5ac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1834,6 +1834,7 @@ version = "0.1.0"
 dependencies = [
  "atproto",
  "axum",
+ "bon",
  "http 1.3.1",
  "serde",
  "serde_json",
diff --git a/router/Cargo.toml b/router/Cargo.toml
index 1a09bd8..2426dd6 100644
--- a/router/Cargo.toml
+++ b/router/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2024"
 [dependencies]
 atproto.workspace = true
 axum = { version = "0.8.3", features = ["json"] }
+bon = "3.6.4"
 http = "1.3.1"
 serde.workspace = true
 serde_json.workspace = true
diff --git a/router/src/lib.rs b/router/src/lib.rs
index 1a3b212..bddad49 100644
--- a/router/src/lib.rs
+++ b/router/src/lib.rs
@@ -20,9 +20,7 @@ impl Default for Router {
 }
 impl Router {
   pub fn new() -> Self {
-    let mut router = AxumRouter::new();
-    // TODO: Only add if there is at least one XRPC endpoint
-    router = XrpcEndpoint::not_implemented().add_to_router(router);
+    let router = AxumRouter::new();
     let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127,0,0,1)), 6702);
     Router { router, addr }
   }