diff --git a/src/components/Form.js b/src/components/Form.js
index bfd75a020b32..3659db119f9d 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -264,7 +264,7 @@ function Form(props) {
 
                 // We want to initialize the input value if it's undefined
                 if (_.isUndefined(inputValues[inputID])) {
-                    inputValues[inputID] = defaultValue || '';
+                    inputValues[inputID] = _.isBoolean(defaultValue) ? defaultValue : defaultValue || '';
                 }
 
                 // We force the form to set the input value from the defaultValue props if there is a saved valid value