diff --git a/meilidb-data/src/database/index/mod.rs b/meilidb-data/src/database/index/mod.rs
index f58974f66..bf5f3575c 100644
--- a/meilidb-data/src/database/index/mod.rs
+++ b/meilidb-data/src/database/index/mod.rs
@@ -264,6 +264,43 @@ impl Index {
         SynonymsDeletion::new(self)
     }
 
+    pub fn update_status(
+        &self,
+        update_id: u64,
+    ) -> Result<Option<Result<(), String>>, Error>
+    {
+        let update_id = update_id.to_be_bytes();
+        match self.updates_results_index.get(update_id)? {
+            Some(value) => {
+                let value = bincode::deserialize(&value)?;
+                Ok(Some(value))
+            },
+            None => Ok(None),
+        }
+    }
+
+    pub fn update_status_blocking(
+        &self,
+        update_id: u64,
+    ) -> Result<Result<(), String>, Error>
+    {
+        let update_id_bytes = update_id.to_be_bytes().to_vec();
+        let mut subscription = self.updates_results_index.watch_prefix(update_id_bytes);
+
+        // if we find the update result return it now
+        if let Some(result) = self.update_status(update_id)? {
+            return Ok(result)
+        }
+
+        // this subscription is used to block the thread
+        // until the update_id is inserted in the tree
+        subscription.next();
+
+        // the thread has been unblocked, it means that the update result
+        // has been inserted in the tree, retrieve it
+        Ok(self.update_status(update_id)?.unwrap())
+    }
+
     pub fn document<T>(
         &self,
         fields: Option<&HashSet<&str>>,
diff --git a/meilidb-data/tests/updates.rs b/meilidb-data/tests/updates.rs
index 7cfe7f23e..783664410 100644
--- a/meilidb-data/tests/updates.rs
+++ b/meilidb-data/tests/updates.rs
@@ -22,10 +22,8 @@ fn insert_delete_document() {
     let mut addition = index.documents_addition();
     addition.update_document(&doc1);
     let update_id = addition.finalize().unwrap();
-    println!("addition update id: {}", update_id);
-
-    // TODO remove this and create a waitable function
-    std::thread::sleep(std::time::Duration::from_millis(100));
+    let status = index.update_status_blocking(update_id).unwrap();
+    assert_eq!(status, Ok(()));
 
     let docs = index.query_builder().query("hello", 0..10).unwrap();
     assert_eq!(docs.len(), 1);
@@ -34,10 +32,8 @@ fn insert_delete_document() {
     let mut deletion = index.documents_deletion();
     deletion.delete_document(&doc1).unwrap();
     let update_id = deletion.finalize().unwrap();
-    println!("deletion update id: {}", update_id);
-
-    // TODO remove this and create a waitable function
-    std::thread::sleep(std::time::Duration::from_millis(100));
+    let status = index.update_status_blocking(update_id).unwrap();
+    assert_eq!(status, Ok(()));
 
     let docs = index.query_builder().query("hello", 0..10).unwrap();
     assert_eq!(docs.len(), 0);
@@ -57,10 +53,8 @@ fn replace_document() {
     let mut addition = index.documents_addition();
     addition.update_document(&doc1);
     let update_id = addition.finalize().unwrap();
-    println!("addition update id: {}", update_id);
-
-    // TODO remove this and create a waitable function
-    std::thread::sleep(std::time::Duration::from_millis(100));
+    let status = index.update_status_blocking(update_id).unwrap();
+    assert_eq!(status, Ok(()));
 
     let docs = index.query_builder().query("hello", 0..10).unwrap();
     assert_eq!(docs.len(), 1);
@@ -69,10 +63,8 @@ fn replace_document() {
     let mut deletion = index.documents_addition();
     deletion.update_document(&doc2);
     let update_id = deletion.finalize().unwrap();
-    println!("deletion update id: {}", update_id);
-
-    // TODO remove this and create a waitable function
-    std::thread::sleep(std::time::Duration::from_millis(100));
+    let status = index.update_status_blocking(update_id).unwrap();
+    assert_eq!(status, Ok(()));
 
     let docs = index.query_builder().query("hello", 0..10).unwrap();
     assert_eq!(docs.len(), 0);