diff --git a/src/router/layers.rs b/src/router/layers.rs
index e8a8b7e8..7ebec16e 100644
--- a/src/router/layers.rs
+++ b/src/router/layers.rs
@@ -49,6 +49,7 @@ pub(crate) fn build(services: &Arc<Services>) -> Result<(Router, Guard)> {
 	))]
 	let layers = layers.layer(compression_layer(server));
 
+	let services_ = services.clone();
 	let layers = layers
 		.layer(SetSensitiveHeadersLayer::new([header::AUTHORIZATION]))
 		.layer(
@@ -89,7 +90,7 @@ pub(crate) fn build(services: &Arc<Services>) -> Result<(Router, Guard)> {
 		))
 		.layer(cors_layer(server))
 		.layer(body_limit_layer(server))
-		.layer(CatchPanicLayer::custom(catch_panic));
+		.layer(CatchPanicLayer::custom(move |panic| catch_panic(panic, services_.clone())));
 
 	let (router, guard) = router::build(services);
 	Ok((router.layer(layers), guard))
@@ -167,15 +168,14 @@ fn body_limit_layer(server: &Server) -> DefaultBodyLimit {
 #[allow(clippy::needless_pass_by_value)]
 fn catch_panic(
 	err: Box<dyn Any + Send + 'static>,
+	services: Arc<Services>,
 ) -> http::Response<http_body_util::Full<bytes::Bytes>> {
-	//TODO: XXX
-	/*
-		conduwuit_service::services()
-			.server
-			.metrics
-			.requests_panic
-			.fetch_add(1, std::sync::atomic::Ordering::Release);
-	*/
+	services
+		.server
+		.metrics
+		.requests_panic
+		.fetch_add(1, std::sync::atomic::Ordering::Release);
+
 	let details = if let Some(s) = err.downcast_ref::<String>() {
 		s.clone()
 	} else if let Some(s) = err.downcast_ref::<&str>() {
diff --git a/src/router/request.rs b/src/router/request.rs
index e0373646..b6c22d45 100644
--- a/src/router/request.rs
+++ b/src/router/request.rs
@@ -15,40 +15,12 @@ use http::{Method, StatusCode, Uri};
 use tokio::time::sleep;
 use tracing::Span;
 
-#[tracing::instrument(
-	name = "request",
-	level = "debug",
-	skip_all,
-	fields(
-		active = %services
-			.server
-			.metrics
-			.requests_handle_active
-			.fetch_add(1, Ordering::Relaxed),
-		handled = %services
-			.server
-			.metrics
-			.requests_handle_finished
-			.load(Ordering::Relaxed),
-	)
-)]
+#[tracing::instrument(name = "request", level = "debug", skip_all)]
 pub(crate) async fn handle(
 	State(services): State<Arc<Services>>,
 	req: http::Request<axum::body::Body>,
 	next: axum::middleware::Next,
 ) -> Result<Response, StatusCode> {
-	#[cfg(debug_assertions)]
-	conduwuit::defer! {{
-		_ = services.server
-			.metrics
-			.requests_handle_finished
-			.fetch_add(1, Ordering::Relaxed);
-		_ = services.server
-			.metrics
-			.requests_handle_active
-			.fetch_sub(1, Ordering::Relaxed);
-	}};
-
 	if !services.server.running() {
 		debug_warn!(
 			method = %req.method(),
@@ -87,16 +59,40 @@ pub(crate) async fn handle(
 	level = "debug",
 	parent = parent,
 	skip_all,
+	fields(
+		active = %services
+			.server
+			.metrics
+			.requests_handle_active
+			.fetch_add(1, Ordering::Relaxed),
+		handled = %services
+			.server
+			.metrics
+			.requests_handle_finished
+			.load(Ordering::Relaxed),
+	)
 )]
 async fn execute(
 	// we made a safety contract that Services will not go out of scope
 	// during the request; this ensures a reference is accounted for at
 	// the base frame of the task regardless of its detachment.
-	_services: &Arc<Services>,
+	services: &Arc<Services>,
 	req: http::Request<axum::body::Body>,
 	next: axum::middleware::Next,
 	parent: Span,
 ) -> Response {
+	#[cfg(debug_assertions)]
+	conduwuit::defer! {{
+		_ = services.server
+			.metrics
+			.requests_handle_finished
+			.fetch_add(1, Ordering::Relaxed);
+		_ = services.server
+			.metrics
+			.requests_handle_active
+			.fetch_sub(1, Ordering::Relaxed);
+	}};
+
 	next.run(req).await
 }