diff --git a/meilisearch-http/src/index_controller/index_actor/actor.rs b/meilisearch-http/src/index_controller/index_actor/actor.rs
index 31e2a58d4..4d8324e11 100644
--- a/meilisearch-http/src/index_controller/index_actor/actor.rs
+++ b/meilisearch-http/src/index_controller/index_actor/actor.rs
@@ -168,9 +168,7 @@ impl<S: IndexStore + Sync + Send> IndexActor<S> {
             None => self.store.create(uuid, None).await?,
         };
 
-        let result =
-            spawn_blocking(move || update_handler.handle_update(meta, data, index)).await?;
-        Ok(result)
+        Ok(spawn_blocking(move || update_handler.handle_update(meta, data, index)).await?)
     }
 
     async fn handle_settings(&self, uuid: Uuid) -> IndexResult<Settings<Checked>> {
diff --git a/meilisearch-http/src/index_controller/update_actor/store/mod.rs b/meilisearch-http/src/index_controller/update_actor/store/mod.rs
index 28204f4c0..39de02ef1 100644
--- a/meilisearch-http/src/index_controller/update_actor/store/mod.rs
+++ b/meilisearch-http/src/index_controller/update_actor/store/mod.rs
@@ -303,9 +303,13 @@ impl UpdateStore {
                     }
                     None => None,
                 };
+
                 // Process the pending update using the provided user function.
-                let result = Handle::current()
-                    .block_on(index_handle.update(index_uuid, processing, file))?;
+                let handle = Handle::current();
+                let result = match handle.block_on(index_handle.update(index_uuid, processing.clone(), file)) {
+                    Ok(result) => result,
+                    Err(e) => Err(processing.fail(e.to_string())),
+                };
 
                 // Once the pending update have been successfully processed
                 // we must remove the content from the pending and processing stores and