diff --git a/crates/milli/src/update/new/document.rs b/crates/milli/src/update/new/document.rs
index ab8910b62..ab11148e5 100644
--- a/crates/milli/src/update/new/document.rs
+++ b/crates/milli/src/update/new/document.rs
@@ -476,7 +476,7 @@ impl<'doc> Versions<'doc> {
         engine: &rhai::Engine,
         edit_function: &rhai::AST,
         doc_alloc: &'doc bumpalo::Bump,
-    ) -> Result<Option<Self>> {
+    ) -> Result<Option<Option<Self>>> {
         let Some(data) = versions.next() else { return Ok(None) };
 
         let mut doc = doc.unwrap_or_default();
@@ -495,12 +495,19 @@ impl<'doc> Versions<'doc> {
 
             let _ = engine.eval_ast_with_scope::<rhai::Dynamic>(&mut scope, edit_function).unwrap();
             data = RawMap::with_hasher_in(FxBuildHasher, doc_alloc);
-            for (key, value) in scope.get_value::<rhai::Map>("doc").unwrap() {
-                let mut vec = bumpalo::collections::Vec::new_in(doc_alloc);
-                serde_json::to_writer(&mut vec, &value).unwrap();
-                let key = doc_alloc.alloc_str(key.as_str());
-                let raw_value = serde_json::from_slice(vec.into_bump_slice()).unwrap();
-                data.insert(key, raw_value);
+            match scope.get_value::<Option<rhai::Map>>("doc").unwrap() {
+                Some(map) => {
+                    for (key, value) in map {
+                        let mut vec = bumpalo::collections::Vec::new_in(doc_alloc);
+                        serde_json::to_writer(&mut vec, &value).unwrap();
+                        let key = doc_alloc.alloc_str(key.as_str());
+                        let raw_value = serde_json::from_slice(vec.into_bump_slice()).unwrap();
+                        data.insert(key, raw_value);
+                    }
+                }
+                // In case the deletes the document and it's not the last change
+                // we simply set the document to an empty one and await the next change.
+                None => (),
             }
         }
 
@@ -513,15 +520,19 @@ impl<'doc> Versions<'doc> {
 
         let _ = engine.eval_ast_with_scope::<rhai::Dynamic>(&mut scope, edit_function).unwrap();
         data = RawMap::with_hasher_in(FxBuildHasher, doc_alloc);
-        for (key, value) in scope.get_value::<rhai::Map>("doc").unwrap() {
-            let mut vec = bumpalo::collections::Vec::new_in(doc_alloc);
-            serde_json::to_writer(&mut vec, &value).unwrap();
-            let key = doc_alloc.alloc_str(key.as_str());
-            let raw_value = serde_json::from_slice(vec.into_bump_slice()).unwrap();
-            data.insert(key, raw_value);
+        match scope.get_value::<Option<rhai::Map>>("doc").unwrap() {
+            Some(map) => {
+                for (key, value) in map {
+                    let mut vec = bumpalo::collections::Vec::new_in(doc_alloc);
+                    serde_json::to_writer(&mut vec, &value).unwrap();
+                    let key = doc_alloc.alloc_str(key.as_str());
+                    let raw_value = serde_json::from_slice(vec.into_bump_slice()).unwrap();
+                    data.insert(key, raw_value);
+                }
+                Ok(Some(Some(Self::single(data))))
+            }
+            None => Ok(Some(None)),
         }
-
-        Ok(Some(Self::single(data)))
     }
 
     pub fn single(version: RawMap<'doc, FxBuildHasher>) -> Self {
diff --git a/crates/milli/src/update/new/indexer/document_operation.rs b/crates/milli/src/update/new/indexer/document_operation.rs
index 4fead4f0c..d8232624a 100644
--- a/crates/milli/src/update/new/indexer/document_operation.rs
+++ b/crates/milli/src/update/new/indexer/document_operation.rs
@@ -527,6 +527,7 @@ impl<'pl> PayloadOperations<'pl> {
     }
 
     /// Returns only the most recent version of a document based on the updates from the payloads.
+    #[allow(clippy::too_many_arguments)]
     fn merge<'doc>(
         &self,
         rtxn: &heed::RoTxn,
@@ -604,7 +605,18 @@ impl<'pl> PayloadOperations<'pl> {
                             .get(rtxn, &self.docid)?
                             .map(|obkv| obkv_to_rhaimap(obkv, fidmap))
                             .transpose()?;
-                        Versions::multiple_with_edits(doc, versions, engine, ast, doc_alloc)?
+                        match Versions::multiple_with_edits(doc, versions, engine, ast, doc_alloc)?
+                        {
+                            Some(Some(versions)) => Some(versions),
+                            Some(None) if self.is_new => return Ok(None),
+                            Some(None) => {
+                                return Ok(Some(DocumentChange::Deletion(Deletion::create(
+                                    self.docid,
+                                    external_doc,
+                                ))));
+                            }
+                            None => None,
+                        }
                     }
                     None => Versions::multiple(versions)?,
                 };