diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
index a416c25545..e538a1a789 100644
--- a/src/app/submission/objects/submission-objects.reducer.ts
+++ b/src/app/submission/objects/submission-objects.reducer.ts
@@ -615,7 +615,7 @@ function changeSectionState(state: SubmissionObjectState, action: EnableSectionA
  *    the new state, with the section new validity status.
  */
 function setIsValid(state: SubmissionObjectState, action: SectionStatusChangeAction): SubmissionObjectState {
-  if (hasValue(state[ action.payload.submissionId ].sections[ action.payload.sectionId ])) {
+  if (isNotEmpty(state[ action.payload.submissionId ]) && hasValue(state[ action.payload.submissionId ].sections[ action.payload.sectionId ])) {
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         sections: Object.assign({}, state[ action.payload.submissionId ].sections,
diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts
index bf962d685c..5aea0b313f 100644
--- a/src/app/submission/sections/license/section-license.component.ts
+++ b/src/app/submission/sections/license/section-license.component.ts
@@ -74,7 +74,6 @@ export class LicenseSectionComponent extends SectionModelComponent {
           // Retrieve license accepted status
           if ((this.sectionData.data as WorkspaceitemSectionLicenseObject).granted) {
             (model as DynamicCheckboxModel).valueUpdates.next(true);
-            // this.sectionService.setSectionStatus(this.submissionId, this.sectionData.id, true);
           } else {
             (model as DynamicCheckboxModel).valueUpdates.next(false);
           }
@@ -130,7 +129,6 @@ export class LicenseSectionComponent extends SectionModelComponent {
   onChange(event: DynamicFormControlEvent) {
     const path = this.formOperationsService.getFieldPathSegmentedFromChangeEvent(event);
     const value = this.formOperationsService.getFieldValueFromChangeEvent(event);
-    // this.sectionService.setSectionStatus(this.submissionId, this.sectionData.id, value.value);
     if (value) {
       this.operationsBuilder.add(this.pathCombiner.getPath(path), value.value.toString(), false, true);
       // Remove any section's errors
diff --git a/src/app/submission/sections/models/section.model.ts b/src/app/submission/sections/models/section.model.ts
index 72273e9f47..3830e202a2 100644
--- a/src/app/submission/sections/models/section.model.ts
+++ b/src/app/submission/sections/models/section.model.ts
@@ -47,9 +47,9 @@ export abstract class SectionModelComponent implements OnDestroy, OnInit, Sectio
   }
 
   ngOnDestroy(): void {
-    this.onSectionDestroy();
     if (hasValue(this.sectionStatusSub)) {
       this.sectionStatusSub.unsubscribe();
     }
+    this.onSectionDestroy();
   }
 }