diff --git a/src/Logic/FeatureSource/Sources/FavouritesFeatureSource.ts b/src/Logic/FeatureSource/Sources/FavouritesFeatureSource.ts
index 5a3e7d2e8..174c9ee3b 100644
--- a/src/Logic/FeatureSource/Sources/FavouritesFeatureSource.ts
+++ b/src/Logic/FeatureSource/Sources/FavouritesFeatureSource.ts
@@ -209,6 +209,9 @@ export default class FavouritesFeatureSource extends StaticFeatureSource {
                 continue
             }
             const store = featureProperties.getStore(id)
+            if(store === undefined){
+                continue
+            }
             const origValue = store.data._favourite
             if (detected.indexOf(id) >= 0) {
                 if (origValue !== "yes") {
diff --git a/src/Utils.ts b/src/Utils.ts
index df6d99199..4dbb40ee1 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -291,7 +291,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
                     seen.add(ks)
                     uniq.push(img)
                 }
-            } else {
+            } else if(ks){
                 const ksNoNull = Lists.noNull(ks)
                 const hasBeenSeen = ksNoNull.some((k) => seen.has(k))
                 if (!hasBeenSeen) {