diff --git a/src/controller/mod.rs b/src/controller/mod.rs
index 54c6f9870..d7ec88b6f 100644
--- a/src/controller/mod.rs
+++ b/src/controller/mod.rs
@@ -219,11 +219,15 @@ impl IntoResponse for Error {
                     StatusCode::BAD_REQUEST,
                     ErrorDetail::with_reason("Bad Request"),
                 )
-            }
-            _ => (
+            },
+            Self::BadRequest => (
                 StatusCode::BAD_REQUEST,
                 ErrorDetail::with_reason("Bad Request"),
             ),
+            _ => (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                ErrorDetail::new("internal_server_error", "Internal Server Error"),
+            ),
         };
 
         (public_facing_error.0, Json(public_facing_error.1)).into_response()