diff --git a/core/frontend/src/views/dataFilling/form/EditFormData.vue b/core/frontend/src/views/dataFilling/form/EditFormData.vue
index 90e8409269..ab6b4724cb 100644
--- a/core/frontend/src/views/dataFilling/form/EditFormData.vue
+++ b/core/frontend/src/views/dataFilling/form/EditFormData.vue
@@ -115,6 +115,19 @@ export default {
             } else {
               f.value = []
             }
+          } else if (f.type === 'select' && !f.settings.multiple || f.type === 'radio') {
+            if (_value) {
+              if (!this.readonly) {
+                const options = map(f.settings.options, f => f.value)
+                if (!includes(options, _value)) {
+                  f.value = undefined
+                } else {
+                  f.value = _value
+                }
+              } else {
+                f.value = _value
+              }
+            }
           } else {
             f.value = _value
           }