diff --git a/src/client/components/forms/Form/buildStateFromSchema.js b/src/client/components/forms/Form/buildStateFromSchema.js
index f096bf1126..c9cc6532fb 100644
--- a/src/client/components/forms/Form/buildStateFromSchema.js
+++ b/src/client/components/forms/Form/buildStateFromSchema.js
@@ -15,7 +15,6 @@ const buildStateFromSchema = async (fieldSchema, fullData) => {
 
     const structureFieldState = (field, data = {}) => {
       const value = typeof data[field.name] !== 'undefined' ? data[field.name] : field.defaultValue;
-
       const fieldState = {
         value,
         initialValue: value,
@@ -78,7 +77,6 @@ const buildStateFromSchema = async (fieldSchema, fullData) => {
           };
         }
 
-
         return {
           ...state,
           [`${path}${field.name}`]: structureFieldState(field, data),
@@ -92,7 +90,10 @@ const buildStateFromSchema = async (fieldSchema, fullData) => {
         };
       }
 
-      return state;
+      return {
+        ...state,
+        [`${path}${field.name}`]: structureFieldState(field, data),
+      };
     }, {});
 
     const resultingState = iterateFields(fieldSchema, fullData);