diff --git a/src/services/entity_changes.js b/src/services/entity_changes.js
index c83b47c06..35831dc1c 100644
--- a/src/services/entity_changes.js
+++ b/src/services/entity_changes.js
@@ -102,13 +102,14 @@ function fillEntityChanges(entityName, entityPrimaryKey, condition = '') {
 
                 const entity = becca.getEntity(entityName, entityId);
 
+                // entity might be null (not present in becca) when it's deleted
                 addEntityChange({
                     entityName,
                     entityId,
-                    hash: entity.generateHash(),
+                    hash: entity?.generateHash() || "|deleted",
                     isErased: false,
-                    utcDateChanged: entity.getUtcDateChanged(),
-                    isSynced: entityName !== 'options' || !!entity.isSynced
+                    utcDateChanged: entity?.getUtcDateChanged() || dateUtils.utcNowDateTime(),
+                    isSynced: entityName !== 'options' || !!entity?.isSynced
                 });
             }
         }