diff --git a/pandora/document/models.py b/pandora/document/models.py
index 8c9f676d2..5d0c8f519 100644
--- a/pandora/document/models.py
+++ b/pandora/document/models.py
@@ -368,7 +368,7 @@ class Document(models.Model):
                 else:
                     if data[key]:
                         self.data[key] = ox.escape_html(data[key])
-                    else:
+                    elif key in self.data:
                         del self.data[key]
 
     @property