diff --git a/src/components/Form.js b/src/components/Form.js
index ac9aaf1673fd..a648abceb0a3 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -144,7 +144,11 @@ class Form extends React.Component {
             // We clone the child passing down all form props
             const inputID = child.props.inputID;
             const defaultValue = this.props.draftValues[inputID] || child.props.defaultValue;
-            this.inputValues[inputID] = defaultValue;
+
+            // We want to initialize the input value if it's undefined
+            if (_.isUndefined(this.inputValues[inputID])) {
+                this.inputValues[inputID] = defaultValue;
+            }
 
             return React.cloneElement(child, {
                 ref: node => this.inputRefs[inputID] = node,