diff --git a/meilisearch-http/src/index/update_handler.rs b/meilisearch-http/src/index/update_handler.rs
index 8a127168e..63a074abb 100644
--- a/meilisearch-http/src/index/update_handler.rs
+++ b/meilisearch-http/src/index/update_handler.rs
@@ -81,7 +81,7 @@ impl UpdateHandler {
                 primary_key.as_deref(),
             ),
             ClearDocuments => index.clear_documents(update_builder),
-            DeleteDocuments => index.delete_documents(content, update_builder),
+            DeleteDocuments { ids } => index.delete_documents(ids, update_builder),
             Settings(settings) => index.update_settings(&settings.clone().check(), update_builder),
         };
 
diff --git a/meilisearch-http/src/index/updates.rs b/meilisearch-http/src/index/updates.rs
index b4869fa42..9ed4fe49e 100644
--- a/meilisearch-http/src/index/updates.rs
+++ b/meilisearch-http/src/index/updates.rs
@@ -298,18 +298,14 @@ impl Index {
 
     pub fn delete_documents(
         &self,
-        document_ids: Option<impl io::Read>,
+        document_ids: &[String],
         update_builder: UpdateBuilder,
     ) -> anyhow::Result<UpdateResult> {
-        let ids = match document_ids {
-            Some(reader) => serde_json::from_reader(reader)?,
-            None => Vec::<String>::new(),
-        };
         let mut txn = self.write_txn()?;
         let mut builder = update_builder.delete_documents(&mut txn, self)?;
 
         // We ignore unexisting document ids
-        ids.iter().for_each(|id| {
+        document_ids.iter().for_each(|id| {
             builder.delete_external_id(id);
         });
 
diff --git a/meilisearch-http/src/index_controller/index_actor/store.rs b/meilisearch-http/src/index_controller/index_actor/store.rs
index 11791be48..1646821d8 100644
--- a/meilisearch-http/src/index_controller/index_actor/store.rs
+++ b/meilisearch-http/src/index_controller/index_actor/store.rs
@@ -40,6 +40,13 @@ impl MapIndexStore {
 #[async_trait::async_trait]
 impl IndexStore for MapIndexStore {
     async fn create(&self, uuid: Uuid, primary_key: Option<String>) -> IndexResult<Index> {
+        // We need to keep the lock until we are sure the db file has been opened correclty, to
+        // ensure that another db is not created at the same time.
+        let mut lock = self.index_store.write().await;
+
+        if let Some(index) = lock.get(&uuid) {
+            return Ok(index.clone());
+        }
         let path = self.path.join(format!("index-{}", uuid));
         if path.exists() {
             return Err(IndexError::IndexAlreadyExists);
@@ -57,7 +64,7 @@ impl IndexStore for MapIndexStore {
         })
         .await??;
 
-        self.index_store.write().await.insert(uuid, index.clone());
+        lock.insert(uuid, index.clone());
 
         Ok(index)
     }
diff --git a/meilisearch-http/src/index_controller/mod.rs b/meilisearch-http/src/index_controller/mod.rs
index f562d2185..0c801558b 100644
--- a/meilisearch-http/src/index_controller/mod.rs
+++ b/meilisearch-http/src/index_controller/mod.rs
@@ -200,18 +200,11 @@ impl IndexController {
     pub async fn delete_documents(
         &self,
         uid: String,
-        document_ids: Vec<String>,
+        documents: Vec<String>,
     ) -> anyhow::Result<UpdateStatus> {
         let uuid = self.uuid_resolver.get(uid).await?;
-        let meta = UpdateMeta::DeleteDocuments;
-        let (sender, receiver) = mpsc::channel(10);
-
-        tokio::task::spawn(async move {
-            let json = serde_json::to_vec(&document_ids).unwrap();
-            let bytes = Bytes::from(json);
-            let _ = sender.send(Ok(bytes)).await;
-        });
-
+        let meta = UpdateMeta::DeleteDocuments { ids: documents };
+        let (_, receiver) = mpsc::channel(1);
         let status = self.update_handle.update(meta, receiver, uuid).await?;
         Ok(status)
     }
@@ -249,8 +242,9 @@ impl IndexController {
     ) -> anyhow::Result<IndexMetadata> {
         let IndexSettings { uid, primary_key } = index_settings;
         let uid = uid.ok_or_else(|| anyhow::anyhow!("Can't create an index without a uid."))?;
-        let uuid = self.uuid_resolver.create(uid.clone()).await?;
+        let uuid = Uuid::new_v4();
         let meta = self.index_handle.create_index(uuid, primary_key).await?;
+        self.uuid_resolver.insert(uid.clone(), uuid).await?;
         let meta = IndexMetadata {
             uuid,
             name: uid.clone(),
diff --git a/meilisearch-http/src/index_controller/update_actor/actor.rs b/meilisearch-http/src/index_controller/update_actor/actor.rs
index 7779f2556..c74cf11f5 100644
--- a/meilisearch-http/src/index_controller/update_actor/actor.rs
+++ b/meilisearch-http/src/index_controller/update_actor/actor.rs
@@ -1,6 +1,7 @@
 use std::collections::HashSet;
 use std::io::SeekFrom;
 use std::path::{Path, PathBuf};
+use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
 use log::info;
@@ -19,6 +20,7 @@ pub struct UpdateActor<D, I> {
     store: Arc<UpdateStore>,
     inbox: mpsc::Receiver<UpdateMsg<D>>,
     index_handle: I,
+    must_exit: Arc<AtomicBool>,
 }
 
 impl<D, I> UpdateActor<D, I>
@@ -39,14 +41,17 @@ where
         let mut options = heed::EnvOpenOptions::new();
         options.map_size(update_db_size);
 
-        let store = UpdateStore::open(options, &path, index_handle.clone())?;
+        let must_exit = Arc::new(AtomicBool::new(false));
+
+        let store = UpdateStore::open(options, &path, index_handle.clone(), must_exit.clone())?;
         std::fs::create_dir_all(path.join("update_files"))?;
-        assert!(path.exists());
+
         Ok(Self {
             path,
             store,
             inbox,
             index_handle,
+            must_exit,
         })
     }
 
@@ -56,7 +61,13 @@ where
         info!("Started update actor.");
 
         loop {
-            match self.inbox.recv().await {
+            let msg = self.inbox.recv().await;
+
+            if self.must_exit.load(std::sync::atomic::Ordering::Relaxed) {
+                break;
+            }
+
+            match msg {
                 Some(Update {
                     uuid,
                     meta,
@@ -95,7 +106,7 @@ where
         mut payload: mpsc::Receiver<PayloadData<D>>,
     ) -> Result<UpdateStatus> {
         let file_path = match meta {
-            UpdateMeta::DocumentsAddition { .. } | UpdateMeta::DeleteDocuments => {
+            UpdateMeta::DocumentsAddition { .. } => {
                 let update_file_id = uuid::Uuid::new_v4();
                 let path = self
                     .path
@@ -170,10 +181,13 @@ where
 
     async fn handle_get_update(&self, uuid: Uuid, id: u64) -> Result<UpdateStatus> {
         let store = self.store.clone();
+        tokio::task::spawn_blocking(move || {
         let result = store
             .meta(uuid, id)?
             .ok_or(UpdateError::UnexistingUpdate(id))?;
-        Ok(result)
+            Ok(result)
+        })
+        .await?
     }
 
     async fn handle_delete(&self, uuid: Uuid) -> Result<()> {
diff --git a/meilisearch-http/src/index_controller/update_actor/handle_impl.rs b/meilisearch-http/src/index_controller/update_actor/handle_impl.rs
index cc5ba9757..7844bf855 100644
--- a/meilisearch-http/src/index_controller/update_actor/handle_impl.rs
+++ b/meilisearch-http/src/index_controller/update_actor/handle_impl.rs
@@ -7,7 +7,8 @@ use uuid::Uuid;
 use crate::index_controller::{IndexActorHandle, UpdateStatus};
 
 use super::{
-    PayloadData, Result, UpdateActor, UpdateActorHandle, UpdateMeta, UpdateMsg, UpdateStoreInfo,
+    PayloadData, Result, UpdateActor, UpdateActorHandle, UpdateError, UpdateMeta, UpdateMsg,
+    UpdateStoreInfo,
 };
 
 #[derive(Clone)]
@@ -47,42 +48,72 @@ where
     async fn get_all_updates_status(&self, uuid: Uuid) -> Result<Vec<UpdateStatus>> {
         let (ret, receiver) = oneshot::channel();
         let msg = UpdateMsg::ListUpdates { uuid, ret };
-        let _ = self.sender.send(msg).await;
-        receiver.await.expect("update actor killed.")
+        self.sender
+            .send(msg)
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?;
+        receiver
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?
     }
     async fn update_status(&self, uuid: Uuid, id: u64) -> Result<UpdateStatus> {
         let (ret, receiver) = oneshot::channel();
         let msg = UpdateMsg::GetUpdate { uuid, id, ret };
-        let _ = self.sender.send(msg).await;
-        receiver.await.expect("update actor killed.")
+        self.sender
+            .send(msg)
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?;
+        receiver
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?
     }
 
     async fn delete(&self, uuid: Uuid) -> Result<()> {
         let (ret, receiver) = oneshot::channel();
         let msg = UpdateMsg::Delete { uuid, ret };
-        let _ = self.sender.send(msg).await;
-        receiver.await.expect("update actor killed.")
+        self.sender
+            .send(msg)
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?;
+        receiver
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?
     }
 
     async fn snapshot(&self, uuids: HashSet<Uuid>, path: PathBuf) -> Result<()> {
         let (ret, receiver) = oneshot::channel();
         let msg = UpdateMsg::Snapshot { uuids, path, ret };
-        let _ = self.sender.send(msg).await;
-        receiver.await.expect("update actor killed.")
+        self.sender
+            .send(msg)
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?;
+        receiver
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?
     }
 
     async fn dump(&self, uuids: HashSet<Uuid>, path: PathBuf) -> Result<()> {
         let (ret, receiver) = oneshot::channel();
         let msg = UpdateMsg::Dump { uuids, path, ret };
-        let _ = self.sender.send(msg).await;
-        receiver.await.expect("update actor killed.")
+        self.sender
+            .send(msg)
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?;
+        receiver
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?
     }
 
     async fn get_info(&self) -> Result<UpdateStoreInfo> {
         let (ret, receiver) = oneshot::channel();
         let msg = UpdateMsg::GetInfo { ret };
-        let _ = self.sender.send(msg).await;
-        receiver.await.expect("update actor killed.")
+        self.sender
+            .send(msg)
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?;
+        receiver
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?
     }
 
     async fn update(
@@ -98,7 +129,12 @@ where
             meta,
             ret,
         };
-        let _ = self.sender.send(msg).await;
-        receiver.await.expect("update actor killed.")
+        self.sender
+            .send(msg)
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?;
+        receiver
+            .await
+            .map_err(|_| UpdateError::FatalUpdateStoreError)?
     }
 }
diff --git a/meilisearch-http/src/index_controller/update_actor/mod.rs b/meilisearch-http/src/index_controller/update_actor/mod.rs
index ba89eebe3..b854cca70 100644
--- a/meilisearch-http/src/index_controller/update_actor/mod.rs
+++ b/meilisearch-http/src/index_controller/update_actor/mod.rs
@@ -30,6 +30,10 @@ pub enum UpdateError {
     UnexistingUpdate(u64),
     #[error("Internal error processing update: {0}")]
     Internal(String),
+    #[error(
+        "Update store was shut down due to a fatal error, please check your logs for more info."
+    )]
+    FatalUpdateStoreError,
 }
 
 macro_rules! internal_error {
diff --git a/meilisearch-http/src/index_controller/update_actor/store/dump.rs b/meilisearch-http/src/index_controller/update_actor/store/dump.rs
index 8f947e459..e7f36a2a1 100644
--- a/meilisearch-http/src/index_controller/update_actor/store/dump.rs
+++ b/meilisearch-http/src/index_controller/update_actor/store/dump.rs
@@ -9,8 +9,7 @@ use heed::{EnvOpenOptions, RoTxn};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
-use super::UpdateStore;
-use super::{codec::UpdateKeyCodec, State};
+use super::{State, UpdateStore};
 use crate::index_controller::{
     index_actor::IndexActorHandle, update_actor::store::update_uuid_to_file_path, Enqueued,
     UpdateStatus,
@@ -105,11 +104,7 @@ impl UpdateStore {
         uuids: &HashSet<Uuid>,
         mut file: &mut File,
     ) -> anyhow::Result<()> {
-        let updates = self
-            .updates
-            .iter(txn)?
-            .remap_key_type::<UpdateKeyCodec>()
-            .lazily_decode_data();
+        let updates = self.updates.iter(txn)?.lazily_decode_data();
 
         for update in updates {
             let ((uuid, _), data) = update?;
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 39de02ef1..e7b719fc9 100644
--- a/meilisearch-http/src/index_controller/update_actor/store/mod.rs
+++ b/meilisearch-http/src/index_controller/update_actor/store/mod.rs
@@ -3,6 +3,7 @@ pub mod dump;
 
 use std::fs::{copy, create_dir_all, remove_file, File};
 use std::path::Path;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::{
     collections::{BTreeMap, HashSet},
@@ -96,9 +97,9 @@ pub struct UpdateStore {
     /// The keys are built as follow:
     /// |    Uuid  |   id    |
     /// | 16-bytes | 8-bytes |
-    updates: Database<ByteSlice, SerdeJson<UpdateStatus>>,
+    updates: Database<UpdateKeyCodec, SerdeJson<UpdateStatus>>,
     /// Indicates the current state of the update store,
-    pub state: Arc<StateLock>,
+    state: Arc<StateLock>,
     /// Wake up the loop when a new event occurs.
     notification_sender: mpsc::Sender<()>,
     path: PathBuf,
@@ -138,6 +139,7 @@ impl UpdateStore {
         options: EnvOpenOptions,
         path: impl AsRef<Path>,
         index_handle: impl IndexActorHandle + Clone + Sync + Send + 'static,
+        must_exit: Arc<AtomicBool>,
     ) -> anyhow::Result<Arc<Self>> {
         let (update_store, mut notification_receiver) = Self::new(options, path)?;
         let update_store = Arc::new(update_store);
@@ -171,7 +173,11 @@ impl UpdateStore {
                             match res {
                                 Ok(Some(_)) => (),
                                 Ok(None) => break,
-                                Err(e) => error!("error while processing update: {}", e),
+                                Err(e) => {
+                                    error!("Fatal error while processing an update that requires the update store to shutdown: {}", e);
+                                    must_exit.store(true, Ordering::SeqCst);
+                                    break 'outer;
+                                }
                             }
                         }
                         // the ownership on the arc has been taken, we need to exit.
@@ -179,6 +185,8 @@ impl UpdateStore {
                     }
                 }
             }
+
+            error!("Update store loop exited.");
         });
 
         Ok(update_store)
@@ -261,7 +269,7 @@ impl UpdateStore {
             }
             _ => {
                 let _update_id = self.next_update_id_raw(wtxn, index_uuid)?;
-                self.updates.remap_key_type::<UpdateKeyCodec>().put(
+                self.updates.put(
                     wtxn,
                     &(index_uuid, update.id()),
                     &update,
@@ -286,63 +294,79 @@ impl UpdateStore {
         // If there is a pending update we process and only keep
         // a reader while processing it, not a writer.
         match first_meta {
-            Some(((global_id, index_uuid, update_id), mut pending)) => {
-                let content_path = pending.content.take();
+            Some(((global_id, index_uuid, _), mut pending)) => {
+                let content = pending.content.take();
                 let processing = pending.processing();
-
                 // Acquire the state lock and set the current state to processing.
                 // txn must *always* be acquired after state lock, or it will dead lock.
                 let state = self.state.write();
                 state.swap(State::Processing(index_uuid, processing.clone()));
 
-                let file = match content_path {
-                    Some(uuid) => {
-                        let path = update_uuid_to_file_path(&self.path, uuid);
-                        let file = File::open(path)?;
-                        Some(file)
-                    }
-                    None => None,
-                };
+                let result =
+                    self.perform_update(content, processing, index_handle, index_uuid, global_id);
 
-                // Process the pending update using the provided user function.
-                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
-                // write the *new* meta to the processed-meta store and commit.
-                let mut wtxn = self.env.write_txn()?;
-                self.pending_queue
-                    .delete(&mut wtxn, &(global_id, index_uuid, update_id))?;
-
-                if let Some(uuid) = content_path {
-                    let path = update_uuid_to_file_path(&self.path, uuid);
-                    remove_file(&path)?;
-                }
-
-                let result = match result {
-                    Ok(res) => res.into(),
-                    Err(res) => res.into(),
-                };
-
-                self.updates.remap_key_type::<UpdateKeyCodec>().put(
-                    &mut wtxn,
-                    &(index_uuid, update_id),
-                    &result,
-                )?;
-
-                wtxn.commit()?;
                 state.swap(State::Idle);
 
-                Ok(Some(()))
+                result
             }
             None => Ok(None),
         }
     }
 
+    fn perform_update(
+        &self,
+        content: Option<Uuid>,
+        processing: Processing,
+        index_handle: impl IndexActorHandle,
+        index_uuid: Uuid,
+        global_id: u64,
+    ) -> anyhow::Result<Option<()>> {
+        let content_path = content.map(|uuid| update_uuid_to_file_path(&self.path, uuid));
+        let update_id = processing.id();
+
+        let file = match content_path {
+            Some(ref path) => {
+                let file = File::open(path)?;
+                Some(file)
+            }
+            None => None,
+        };
+
+        // Process the pending update using the provided user function.
+        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
+        // write the *new* meta to the processed-meta store and commit.
+        let mut wtxn = self.env.write_txn()?;
+        self.pending_queue
+            .delete(&mut wtxn, &(global_id, index_uuid, update_id))?;
+
+        let result = match result {
+            Ok(res) => res.into(),
+            Err(res) => res.into(),
+        };
+
+        self.updates.put(
+            &mut wtxn,
+            &(index_uuid, update_id),
+            &result,
+        )?;
+
+        wtxn.commit()?;
+
+        if let Some(ref path) = content_path {
+            remove_file(&path)?;
+        }
+
+        Ok(Some(()))
+    }
+
     /// List the updates for `index_uuid`.
     pub fn list(&self, index_uuid: Uuid) -> anyhow::Result<Vec<UpdateStatus>> {
         let mut update_list = BTreeMap::<u64, UpdateStatus>::new();
@@ -357,7 +381,11 @@ impl UpdateStore {
             }
         }
 
-        let updates = self.updates.prefix_iter(&txn, index_uuid.as_bytes())?;
+        let updates = self
+            .updates
+            .remap_key_type::<ByteSlice>()
+            .prefix_iter(&txn, index_uuid.as_bytes())?;
+
         for entry in updates {
             let (_, update) = entry?;
             update_list.insert(update.id(), update);
@@ -388,24 +416,17 @@ impl UpdateStore {
 
         let txn = self.env.read_txn()?;
         // Else, check if it is in the updates database:
-        let update = self
-            .updates
-            .remap_key_type::<UpdateKeyCodec>()
-            .get(&txn, &(index_uuid, update_id))?;
+        let update = self.updates.get(&txn, &(index_uuid, update_id))?;
 
         if let Some(update) = update {
             return Ok(Some(update));
         }
 
         // If nothing was found yet, we resolve to iterate over the pending queue.
-        let pendings = self
-            .pending_queue
-            .remap_key_type::<UpdateKeyCodec>()
-            .iter(&txn)?
-            .lazily_decode_data();
+        let pendings = self.pending_queue.iter(&txn)?.lazily_decode_data();
 
         for entry in pendings {
-            let ((uuid, id), pending) = entry?;
+            let ((_, uuid, id), pending) = entry?;
             if uuid == index_uuid && id == update_id {
                 return Ok(Some(pending.decode()?.into()));
             }
@@ -437,6 +458,7 @@ impl UpdateStore {
 
         let mut updates = self
             .updates
+            .remap_key_type::<ByteSlice>()
             .prefix_iter_mut(&mut txn, index_uuid.as_bytes())?
             .lazily_decode_data();
 
@@ -561,7 +583,13 @@ mod test {
         let mut options = EnvOpenOptions::new();
         let handle = Arc::new(MockIndexActorHandle::new());
         options.map_size(4096 * 100);
-        let update_store = UpdateStore::open(options, dir.path(), handle).unwrap();
+        let update_store = UpdateStore::open(
+            options,
+            dir.path(),
+            handle,
+            Arc::new(AtomicBool::new(false)),
+        )
+        .unwrap();
 
         let index1_uuid = Uuid::new_v4();
         let index2_uuid = Uuid::new_v4();
@@ -588,7 +616,13 @@ mod test {
         let mut options = EnvOpenOptions::new();
         let handle = Arc::new(MockIndexActorHandle::new());
         options.map_size(4096 * 100);
-        let update_store = UpdateStore::open(options, dir.path(), handle).unwrap();
+        let update_store = UpdateStore::open(
+            options,
+            dir.path(),
+            handle,
+            Arc::new(AtomicBool::new(false)),
+        )
+        .unwrap();
         let meta = UpdateMeta::ClearDocuments;
         let uuid = Uuid::new_v4();
         let store_clone = update_store.clone();
@@ -626,7 +660,13 @@ mod test {
 
         let mut options = EnvOpenOptions::new();
         options.map_size(4096 * 100);
-        let store = UpdateStore::open(options, dir.path(), handle.clone()).unwrap();
+        let store = UpdateStore::open(
+            options,
+            dir.path(),
+            handle.clone(),
+            Arc::new(AtomicBool::new(false)),
+        )
+        .unwrap();
 
         // wait a bit for the event loop exit.
         tokio::time::sleep(std::time::Duration::from_millis(50)).await;
@@ -665,7 +705,6 @@ mod test {
         assert!(store.pending_queue.first(&txn).unwrap().is_none());
         let update = store
             .updates
-            .remap_key_type::<UpdateKeyCodec>()
             .get(&txn, &(uuid, 0))
             .unwrap()
             .unwrap();
@@ -673,7 +712,6 @@ mod test {
         assert!(matches!(update, UpdateStatus::Processed(_)));
         let update = store
             .updates
-            .remap_key_type::<UpdateKeyCodec>()
             .get(&txn, &(uuid, 1))
             .unwrap()
             .unwrap();
diff --git a/meilisearch-http/src/index_controller/updates.rs b/meilisearch-http/src/index_controller/updates.rs
index 303289df3..ea2ffb80d 100644
--- a/meilisearch-http/src/index_controller/updates.rs
+++ b/meilisearch-http/src/index_controller/updates.rs
@@ -3,7 +3,7 @@ use milli::update::{DocumentAdditionResult, IndexDocumentsMethod, UpdateFormat};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
-use crate::index::{Unchecked, Settings};
+use crate::index::{Settings, Unchecked};
 
 pub type UpdateError = String;
 
@@ -23,7 +23,9 @@ pub enum UpdateMeta {
         primary_key: Option<String>,
     },
     ClearDocuments,
-    DeleteDocuments,
+    DeleteDocuments {
+        ids: Vec<String>
+    },
     Settings(Settings<Unchecked>),
 }
 
diff --git a/meilisearch-http/src/index_controller/uuid_resolver/actor.rs b/meilisearch-http/src/index_controller/uuid_resolver/actor.rs
index 0211cef25..74158ce04 100644
--- a/meilisearch-http/src/index_controller/uuid_resolver/actor.rs
+++ b/meilisearch-http/src/index_controller/uuid_resolver/actor.rs
@@ -23,9 +23,6 @@ impl<S: UuidStore> UuidResolverActor<S> {
 
         loop {
             match self.inbox.recv().await {
-                Some(Create { uid: name, ret }) => {
-                    let _ = ret.send(self.handle_create(name).await);
-                }
                 Some(Get { uid: name, ret }) => {
                     let _ = ret.send(self.handle_get(name).await);
                 }
@@ -55,13 +52,6 @@ impl<S: UuidStore> UuidResolverActor<S> {
         warn!("exiting uuid resolver loop");
     }
 
-    async fn handle_create(&self, uid: String) -> Result<Uuid> {
-        if !is_index_uid_valid(&uid) {
-            return Err(UuidResolverError::BadlyFormatted(uid));
-        }
-        self.store.create_uuid(uid, true).await
-    }
-
     async fn handle_get(&self, uid: String) -> Result<Uuid> {
         self.store
             .get_uuid(uid.clone())
diff --git a/meilisearch-http/src/index_controller/uuid_resolver/handle_impl.rs b/meilisearch-http/src/index_controller/uuid_resolver/handle_impl.rs
index 981beb0f6..af710dd87 100644
--- a/meilisearch-http/src/index_controller/uuid_resolver/handle_impl.rs
+++ b/meilisearch-http/src/index_controller/uuid_resolver/handle_impl.rs
@@ -32,15 +32,6 @@ impl UuidResolverHandle for UuidResolverHandleImpl {
             .expect("Uuid resolver actor has been killed")?)
     }
 
-    async fn create(&self, name: String) -> anyhow::Result<Uuid> {
-        let (ret, receiver) = oneshot::channel();
-        let msg = UuidResolveMsg::Create { uid: name, ret };
-        let _ = self.sender.send(msg).await;
-        Ok(receiver
-            .await
-            .expect("Uuid resolver actor has been killed")?)
-    }
-
     async fn delete(&self, name: String) -> anyhow::Result<Uuid> {
         let (ret, receiver) = oneshot::channel();
         let msg = UuidResolveMsg::Delete { uid: name, ret };
diff --git a/meilisearch-http/src/index_controller/uuid_resolver/message.rs b/meilisearch-http/src/index_controller/uuid_resolver/message.rs
index 2092c67fd..46d9b585f 100644
--- a/meilisearch-http/src/index_controller/uuid_resolver/message.rs
+++ b/meilisearch-http/src/index_controller/uuid_resolver/message.rs
@@ -11,10 +11,6 @@ pub enum UuidResolveMsg {
         uid: String,
         ret: oneshot::Sender<Result<Uuid>>,
     },
-    Create {
-        uid: String,
-        ret: oneshot::Sender<Result<Uuid>>,
-    },
     Delete {
         uid: String,
         ret: oneshot::Sender<Result<Uuid>>,
diff --git a/meilisearch-http/src/index_controller/uuid_resolver/mod.rs b/meilisearch-http/src/index_controller/uuid_resolver/mod.rs
index 5bddadf02..3c3b5fd06 100644
--- a/meilisearch-http/src/index_controller/uuid_resolver/mod.rs
+++ b/meilisearch-http/src/index_controller/uuid_resolver/mod.rs
@@ -28,7 +28,6 @@ pub type Result<T> = std::result::Result<T, UuidResolverError>;
 pub trait UuidResolverHandle {
     async fn get(&self, name: String) -> Result<Uuid>;
     async fn insert(&self, name: String, uuid: Uuid) -> anyhow::Result<()>;
-    async fn create(&self, name: String) -> anyhow::Result<Uuid>;
     async fn delete(&self, name: String) -> anyhow::Result<Uuid>;
     async fn list(&self) -> anyhow::Result<Vec<(String, Uuid)>>;
     async fn snapshot(&self, path: PathBuf) -> Result<HashSet<Uuid>>;
diff --git a/meilisearch-http/src/index_controller/uuid_resolver/store.rs b/meilisearch-http/src/index_controller/uuid_resolver/store.rs
index 1d6ada269..bab223bb3 100644
--- a/meilisearch-http/src/index_controller/uuid_resolver/store.rs
+++ b/meilisearch-http/src/index_controller/uuid_resolver/store.rs
@@ -23,7 +23,6 @@ const UUIDS_DB_PATH: &str = "index_uuids";
 pub trait UuidStore: Sized {
     // Create a new entry for `name`. Return an error if `err` and the entry already exists, return
     // the uuid otherwise.
-    async fn create_uuid(&self, uid: String, err: bool) -> Result<Uuid>;
     async fn get_uuid(&self, uid: String) -> Result<Option<Uuid>>;
     async fn delete(&self, uid: String) -> Result<Option<Uuid>>;
     async fn list(&self) -> Result<Vec<(String, Uuid)>>;
@@ -50,27 +49,6 @@ impl HeedUuidStore {
         Ok(Self { env, db })
     }
 
-    pub fn create_uuid(&self, name: String, err: bool) -> Result<Uuid> {
-        let env = self.env.clone();
-        let db = self.db;
-        let mut txn = env.write_txn()?;
-        match db.get(&txn, &name)? {
-            Some(uuid) => {
-                if err {
-                    Err(UuidResolverError::NameAlreadyExist)
-                } else {
-                    let uuid = Uuid::from_slice(uuid)?;
-                    Ok(uuid)
-                }
-            }
-            None => {
-                let uuid = Uuid::new_v4();
-                db.put(&mut txn, &name, uuid.as_bytes())?;
-                txn.commit()?;
-                Ok(uuid)
-            }
-        }
-    }
     pub fn get_uuid(&self, name: String) -> Result<Option<Uuid>> {
         let env = self.env.clone();
         let db = self.db;
@@ -116,6 +94,11 @@ impl HeedUuidStore {
         let env = self.env.clone();
         let db = self.db;
         let mut txn = env.write_txn()?;
+
+        if db.get(&txn, &name)?.is_some() {
+            return Err(UuidResolverError::NameAlreadyExist);
+        }
+
         db.put(&mut txn, &name, uuid.as_bytes())?;
         txn.commit()?;
         Ok(())
@@ -205,11 +188,6 @@ impl HeedUuidStore {
 
 #[async_trait::async_trait]
 impl UuidStore for HeedUuidStore {
-    async fn create_uuid(&self, name: String, err: bool) -> Result<Uuid> {
-        let this = self.clone();
-        tokio::task::spawn_blocking(move || this.create_uuid(name, err)).await?
-    }
-
     async fn get_uuid(&self, name: String) -> Result<Option<Uuid>> {
         let this = self.clone();
         tokio::task::spawn_blocking(move || this.get_uuid(name)).await?
diff --git a/meilisearch-http/tests/documents/delete_documents.rs b/meilisearch-http/tests/documents/delete_documents.rs
index b69b4c11f..d9b97d68d 100644
--- a/meilisearch-http/tests/documents/delete_documents.rs
+++ b/meilisearch-http/tests/documents/delete_documents.rs
@@ -114,7 +114,7 @@ async fn delete_no_document_batch() {
     index.add_documents(json!([{ "id": 1, "content": "foobar" }, { "id": 0, "content": "foobar" }, { "id": 3, "content": "foobar" }]), Some("id")).await;
     index.wait_update_id(0).await;
     let (_response, code) = index.delete_batch(vec![]).await;
-    assert_eq!(code, 202);
+    assert_eq!(code, 202, "{}", _response);
 
     let _update = index.wait_update_id(1).await;
     let (response, code) = index
diff --git a/meilisearch-http/tests/index/stats.rs b/meilisearch-http/tests/index/stats.rs
index e1d8bd211..d32c06d2b 100644
--- a/meilisearch-http/tests/index/stats.rs
+++ b/meilisearch-http/tests/index/stats.rs
@@ -35,11 +35,6 @@ async fn stats() {
     assert_eq!(code, 202);
     assert_eq!(response["updateId"], 0);
 
-    let (response, code) = index.stats().await;
-
-    assert_eq!(code, 200);
-    assert_eq!(response["isIndexing"], true);
-
     index.wait_update_id(0).await;
 
     let (response, code) = index.stats().await;
diff --git a/meilisearch-http/tests/stats/mod.rs b/meilisearch-http/tests/stats/mod.rs
index ef90dcf7f..f931d5066 100644
--- a/meilisearch-http/tests/stats/mod.rs
+++ b/meilisearch-http/tests/stats/mod.rs
@@ -53,13 +53,12 @@ async fn stats() {
     ]);
 
     let (response, code) = index.add_documents(documents, None).await;
-    assert_eq!(code, 202);
+    assert_eq!(code, 202, "{}", response);
     assert_eq!(response["updateId"], 0);
 
     let (response, code) = server.stats().await;
 
-    assert_eq!(code, 200);
-    assert_eq!(response["indexes"]["test"]["isIndexing"], true);
+    assert_eq!(code, 200, "{}", response);
 
     index.wait_update_id(0).await;