diff --git a/core/src/datastore/warnings-updater.ts b/core/src/datastore/warnings-updater.ts
index 9637d61004..a1432738ac 100644
--- a/core/src/datastore/warnings-updater.ts
+++ b/core/src/datastore/warnings-updater.ts
@@ -50,7 +50,7 @@ export module WarningsUpdater {
                     );
                 }
             }
-        } else if (document.warnings) {
+        } else if (document.warnings?.nonUniqueIdentifier) {
             delete document.warnings.nonUniqueIdentifier;
             if (!Warnings.hasWarnings(document.warnings)) delete document.warnings;
             indexFacade.put(document);