diff --git a/server-rs/crates/api-server/src/raw_image.rs b/server-rs/crates/api-server/src/raw_image.rs
index 250dd071d..a41bcfd73 100644
--- a/server-rs/crates/api-server/src/raw_image.rs
+++ b/server-rs/crates/api-server/src/raw_image.rs
@@ -63,7 +63,12 @@ pub(crate) async fn edit_raw_image(
     Extension(authenticated): Extension<AuthenticatedAccessToken>,
     Json(payload): Json<RawImageEditRequest>,
 ) -> Result<Json<RawImageEditResponse>, AppError> {
-    let prepared = prepare_request(payload)?;
+    let prepared = tokio::task::spawn_blocking(move || prepare_request(payload))
+        .await
+        .map_err(|error| {
+            AppError::from_status(StatusCode::INTERNAL_SERVER_ERROR)
+                .with_message(error.to_string())
+        })??;
     let settings = require_openai_image_settings(&state)?.with_external_api_audit_context(
         &request_context,
         Some(authenticated.claims().user_id().to_string()),