diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
index 2d1c62f..b4c70b9 100644
--- a/src/handlers/mod.rs
+++ b/src/handlers/mod.rs
@@ -49,7 +49,7 @@ async fn get_core_response(rx: Receiver<Payload>) -> Result<Payload, ApiError> {
     if let Ok(core_response) = timeout(Duration::from_secs(CORE_RESPONSE_TIMEOUT), rx).await {
         debug!("Got gRPC response from Defguard core: {core_response:?}");
         if let Ok(Payload::CoreError(core_error)) = core_response {
-            return Err(core_error.into());
+            return Err(ApiError::BadRequest(format!("{}", core_error.message)));
         };
         core_response
             .map_err(|err| ApiError::Unexpected(format!("Failed to receive core response: {err}")))