diff --git a/src/main.rs b/src/main.rs
index b2b57c9..87d7d13 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,6 +4,7 @@ use anyhow::Context;
 use axum::handler::Handler;
 use axum::{Router, routing::any};
 use dotenvy::dotenv;
+use tower_http::catch_panic::CatchPanicLayer;
 use tower_http::compression::CompressionLayer;
 use tracing::{error, info, level_filters::LevelFilter};
 use tracing_subscriber::{EnvFilter, fmt, prelude::*};
@@ -89,6 +90,7 @@ async fn main() -> anyhow::Result<()> {
             any(proxy::proxy_handler.layer(proxy_middleware)),
         )
         .layer(CompressionLayer::new().gzip(true))
+        .layer(CatchPanicLayer::new())
         .with_state(ctx);
 
     // Run the server