diff --git a/src/client/components/forms/Form/buildStateFromSchema.js b/src/client/components/forms/Form/buildStateFromSchema.js
index 58c890e5b1..f8cdc8b18c 100644
--- a/src/client/components/forms/Form/buildStateFromSchema.js
+++ b/src/client/components/forms/Form/buildStateFromSchema.js
@@ -14,7 +14,7 @@ const buildStateFromSchema = async (fieldSchema, fullData) => {
     const validationPromises = [];
 
     const structureFieldState = (field, data = {}) => {
-      const value = data[field.name] || field.defaultValue;
+      const value = typeof data[field.name] !== 'undefined' ? data[field.name] : field.defaultValue;
 
       const fieldState = {
         value,
@@ -27,7 +27,7 @@ const buildStateFromSchema = async (fieldSchema, fullData) => {
     };
 
     const iterateFields = (fields, data, path = '') => fields.reduce((state, field) => {
-      if (field.name && data[field.name]) {
+      if (field.name && typeof data[field.name] !== 'undefined') {
         if (Array.isArray(data[field.name])) {
           if (field.type === 'array') {
             return {
diff --git a/src/client/components/forms/field-types/Code/Code.js b/src/client/components/forms/field-types/Code/Code.js
index 90f4959da3..a9b95a17ab 100644
--- a/src/client/components/forms/field-types/Code/Code.js
+++ b/src/client/components/forms/field-types/Code/Code.js
@@ -34,7 +34,7 @@ const Code = (props) => {
       return (content) => highlight(content, languages[language]);
     }
 
-    return undefined;
+    return (content) => content;
   });
 
   const path = pathFromProps || name;
diff --git a/src/client/components/forms/field-types/Number/index.js b/src/client/components/forms/field-types/Number/index.js
index 78221b5cd7..ef0a8dc861 100644
--- a/src/client/components/forms/field-types/Number/index.js
+++ b/src/client/components/forms/field-types/Number/index.js
@@ -75,7 +75,7 @@ const NumberField = (props) => {
         required={required}
       />
       <input
-        value={value || ''}
+        value={typeof value !== 'undefined' ? value : ''}
         onChange={handleChange}
         disabled={readOnly ? 'disabled' : undefined}
         placeholder={placeholder}