diff --git a/MVMCoreUI/FormUIHelpers/FormValidator.swift b/MVMCoreUI/FormUIHelpers/FormValidator.swift
index b81804e8..f2cdb8ea 100644
--- a/MVMCoreUI/FormUIHelpers/FormValidator.swift
+++ b/MVMCoreUI/FormUIHelpers/FormValidator.swift
@@ -26,7 +26,9 @@ import MVMCore
     public func insertMolecule(_ molecule: FormItemProtocol) {
         if var molecule = molecule as? FormFieldProtocol,
             let fieldKey = molecule.fieldKey {
-            molecule.baseValue = molecule.formFieldValue()
+            if molecule.baseValue == nil {
+                molecule.baseValue = molecule.formFieldValue()
+            }
             fieldMolecules[fieldKey] = molecule
         }
         if let molecule = molecule as? FormActionFieldProtocol {