diff --git a/src/store/modules/feature.store.js b/src/store/modules/feature.store.js
index 69b89cc3059e3f357064355f325a6d62f088ae3c..a21eff79524492e3c9896936323cc5d304d088cc 100644
--- a/src/store/modules/feature.store.js
+++ b/src/store/modules/feature.store.js
@@ -437,7 +437,7 @@ const feature = {
             ...field,
             //* add value field to extra forms from feature_type and existing values if feature is defined
             value: feature.properties ?
-              feature.properties[field.label] : findCurrentValue(field.label) || null
+              feature.properties[field.name] : findCurrentValue(field.label) || null
           };
         });
         commit('SET_EXTRA_FORMS', extraForm);
diff --git a/src/views/Feature/FeatureEdit.vue b/src/views/Feature/FeatureEdit.vue
index bd7af0297aa700273026e4f32c7c404297e6d3eb..962bfc3c72d0b5e608de9a8007b51d939d4c6823 100644
--- a/src/views/Feature/FeatureEdit.vue
+++ b/src/views/Feature/FeatureEdit.vue
@@ -872,7 +872,7 @@ export default {
             let newXtForm = { ...extraForm };
             // if value wasn't changed in this page, get back previous value of the feature (rather than using feature orginal form, which is missing information to send in request)
             if (newXtForm.value === null) {
-              newXtForm.value = this.currentFeature.properties[newXtForm.label];
+              newXtForm.value = this.currentFeature.properties[newXtForm.name];
             }
             newXtraForms.push(newXtForm);
           }