diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 9d9fe361de..000e8b0834 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -223,8 +223,8 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
 
     const sectionDataToCheck = {};
     Object.keys(sectionData).forEach((key) => {
-      if (this.sectionMetadata && this.sectionMetadata.includes(key)) {
-        sectionDataToCheck[key] = sectionData[key];
+      if (this.sectionData.data && hasValue(this.sectionData.data[key])) {
+        sectionDataToCheck[key] = this.sectionData.data[key];
       }
     });