diff --git a/core/frontend/src/views/chart/components/senior/MapMapping.vue b/core/frontend/src/views/chart/components/senior/MapMapping.vue
index 37eaeae6d9..3689ac8952 100644
--- a/core/frontend/src/views/chart/components/senior/MapMapping.vue
+++ b/core/frontend/src/views/chart/components/senior/MapMapping.vue
@@ -227,7 +227,9 @@ export default {
         }
 
         features.forEach(feature => {
-          this.mappingForm[cCode][feature.properties.name || feature.properties.NAME] = null
+          if (feature.properties.name || feature.properties.NAME) {
+            this.mappingForm[cCode][feature.properties.name || feature.properties.NAME] = null
+          }
         })
       }
       const cCode = this.currentAreaCode