diff --git a/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue b/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue
index fb459a0bd7..5c85bcd868 100644
--- a/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue
+++ b/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue
@@ -124,6 +124,7 @@
 </template>
 
 <script>
+import _ from 'lodash';
 import { klona } from 'klona';
 import { mapActions } from 'pinia';
 import AposModifiedMixin from 'Modules/@apostrophecms/ui/mixins/AposModifiedMixin';
@@ -528,10 +529,13 @@ export default {
             this.docType = docData.type;
           }
           this.original = klona(docData);
-          this.docFields.data = {
-            ...this.getDefault(),
-            ...docData
-          };
+          console.log('docData');
+          console.dir(docData, { depth: 9 });
+          console.log('this.getDefault()');
+          console.dir(this.getDefault(docData), { depth: 9 });
+          this.docFields.data = _.merge(this.getDefault(docData), docData);
+          console.log('this.docFields.data');
+          console.dir(this.docFields.data, { depth: 9 });
           // TODO: Is this block even useful since published is fetched after loadDoc?
           if (this.published) {
             this.changed = detectDocChange(
@@ -546,20 +550,57 @@ export default {
         }
       }
     },
-    getDefault() {
+    getDefault(docData) {
       const doc = {};
-      this.schema.forEach(field => {
-        if (field.name.startsWith('_')) {
-          return;
-        }
-        // Using `hasOwn` here, not simply checking if `field.def` is truthy
-        // so that `false`, `null`, `''` or `0` are taken into account:
-        const hasDefaultValue = Object.hasOwn(field, 'def');
-        doc[field.name] = hasDefaultValue
-          ? klona(field.def)
-          : null;
-      });
+
+      getSchemaDefault(doc, this.schema, docData);
+
       return doc;
+
+      function getSchemaDefault(doc, schema, docData, isArray = false) {
+        schema.forEach(field => {
+          if (field.name.startsWith('_')) {
+            return;
+          }
+
+          // Using `hasOwn` here, not simply checking if `field.def` is truthy
+          // so that `false`, `null`, `''` or `0` are taken into account:
+          const hasDefaultValue = Object.hasOwn(field, 'def');
+
+          if (isArray && hasDefaultValue) {
+            console.log('isArray && hasDefaultValue');
+            console.log(doc);
+
+            docData.forEach((item, index) => {
+              if (!doc[index]) {
+                doc[index] = {};
+              }
+
+              doc[index][field.name] = klona(field.def);
+
+              // if (field.type === 'object') {
+              //   getSchemaDefault(doc[index][field.name], field.schema);
+              // }
+
+              // if (field.type === 'array') {
+              //   getSchemaDefault(doc[index][field.name], field.schema, true, docData[index][field.name]);
+              // }
+            });
+          } else {
+            doc[field.name] = hasDefaultValue
+              ? klona(field.def)
+              : null;
+          }
+
+          if (field.type === 'object') {
+            getSchemaDefault(doc[field.name], field.schema, docData[field.name]);
+          }
+
+          if (field.type === 'array') {
+            getSchemaDefault(doc[field.name], field.schema, docData[field.name], true);
+          }
+        });
+      }
     },
     async preview() {
       if (!await this.confirmAndCancel()) {
diff --git a/modules/@apostrophecms/schema/ui/apos/logic/AposInputObject.js b/modules/@apostrophecms/schema/ui/apos/logic/AposInputObject.js
index da29c2d020..d56dbbc31b 100644
--- a/modules/@apostrophecms/schema/ui/apos/logic/AposInputObject.js
+++ b/modules/@apostrophecms/schema/ui/apos/logic/AposInputObject.js
@@ -30,6 +30,7 @@ export default {
   },
   data () {
     const next = this.getNext();
+    // console.log('🚀 ~ data ~ next:', next);
     return {
       schemaInput: {
         data: next
@@ -117,6 +118,8 @@ export default {
     },
     // Return next at mount or when generation changes
     getNext() {
+      // console.log('this.modelValue', this.modelValue);
+      // console.log('{ ...this.modelValue }', { ...this.modelValue });
       return this.modelValue?.data ? this.modelValue.data : (this.field.def || {});
     }
   }
diff --git a/modules/@apostrophecms/schema/ui/apos/logic/AposSchema.js b/modules/@apostrophecms/schema/ui/apos/logic/AposSchema.js
index caadf492ab..a9fd949a5c 100644
--- a/modules/@apostrophecms/schema/ui/apos/logic/AposSchema.js
+++ b/modules/@apostrophecms/schema/ui/apos/logic/AposSchema.js
@@ -256,6 +256,10 @@ export default {
         };
         next.data[field.name] = fieldState[field.name].data;
       });
+      // console.log('fieldState');
+      // console.dir(fieldState, { depth: 9 });
+      // console.log('next');
+      // console.dir(next, { depth: 9 });
       this.next = next;
       this.fieldState = fieldState;
 
diff --git a/modules/@apostrophecms/schema/ui/apos/mixins/AposInputMixin.js b/modules/@apostrophecms/schema/ui/apos/mixins/AposInputMixin.js
index ddd76e6580..af5ade6f95 100644
--- a/modules/@apostrophecms/schema/ui/apos/mixins/AposInputMixin.js
+++ b/modules/@apostrophecms/schema/ui/apos/mixins/AposInputMixin.js
@@ -138,6 +138,16 @@ export default {
     validateAndEmit () {
       // If the field is conditional and isn't shown, disregard any errors.
       const error = this.conditionMet === false ? false : this.validate(this.next);
+      // console.log('🚀 ~ validateAndEmit ~ error:', error);
+
+      // console.log('this.next', this.next);
+      // console.log('this.convert(this.next)', this.convert(this.next));
+
+      // const isObject = x => typeof x === 'object' && !Array.isArray(x) && x !== null;
+      // if (isObject(this.next)) {
+      //   console.log('this.next is an object');
+      //   this.next
+      // }
 
       this.$emit('update:modelValue', {
         data: error ? this.next : this.convert(this.next),