diff --git a/src/Logic/FeatureSource/Actors/FeaturePropertiesStore.ts b/src/Logic/FeatureSource/Actors/FeaturePropertiesStore.ts
index c8186a8ba..85f2be343 100644
--- a/src/Logic/FeatureSource/Actors/FeaturePropertiesStore.ts
+++ b/src/Logic/FeatureSource/Actors/FeaturePropertiesStore.ts
@@ -96,6 +96,9 @@ export default class FeaturePropertiesStore {
         if (newId === undefined) {
             // We removed the node/way/relation with type 'type' and id 'oldId' on openstreetmap!
             const element = this._elements.get(oldId)
+            if(!element || element.data === undefined){
+                return
+            }
             element.data._deleted = "yes"
             element.ping()
             return