diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index 13cf2016dd..2c04c47290 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -65,6 +65,14 @@ const DECLARATIONS = [
   SubmissionImportExternalCollectionComponent
 ];
 
+const ENTRY_COMPONENTS = [
+  SubmissionSectionUploadComponent,
+  SubmissionSectionformComponent,
+  SubmissionSectionLicenseComponent,
+  SubmissionSectionCcLicensesComponent,
+  SubmissionSectionDetectDuplicateComponent
+];
+
 @NgModule({
   imports: [
     CommonModule,
@@ -88,4 +96,14 @@ const DECLARATIONS = [
  * This module handles all components that are necessary for the submission process
  */
 export class SubmissionModule {
+  /**
+   * NOTE: this method allows to resolve issue with components that using a custom decorator
+   * which are not loaded during CSR otherwise
+   */
+  static withEntryComponents() {
+    return {
+      ngModule: SubmissionModule,
+      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+    };
+  }
 }