diff --git a/src/pages/SoccorsoEditInstructorManager/index.js b/src/pages/SoccorsoEditInstructorManager/index.js
index 256e0e8..15c3534 100644
--- a/src/pages/SoccorsoEditInstructorManager/index.js
+++ b/src/pages/SoccorsoEditInstructorManager/index.js
@@ -435,7 +435,7 @@ const SoccorsoEditInstructorManager = () => {
                     </div> : null}
 
                 {(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
-                && amendmentRequestedDocs[data.amendmentDocumentType]  && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
+                && !isNil(amendmentRequestedDocs[data.amendmentDocumentType])  && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <ol className="appPageSection__list">
@@ -444,10 +444,11 @@ const SoccorsoEditInstructorManager = () => {
                                                                style={{ flexDirection: 'row' }}>
                                 <span>{o.label}</span>
                             </li>) : null}
-                            {amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
+                            {!isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
+                                ? amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
                                                                                        style={{ flexDirection: 'row' }}>
                                 <span>{v}</span>
-                            </li>)}
+                            </li>) : null}
                         </ol>
                     </div> : null}
 
diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js
index e58976a..15949f1 100644
--- a/src/pages/SoccorsoEditPreInstructor/index.js
+++ b/src/pages/SoccorsoEditPreInstructor/index.js
@@ -435,7 +435,7 @@ const SoccorsoEditPreInstructor = () => {
                     </div> : null}
 
                 {(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
-                && amendmentRequestedDocs[data.amendmentDocumentType] && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
+                && !isNil(amendmentRequestedDocs[data.amendmentDocumentType]))
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <ol className="appPageSection__list">
@@ -444,10 +444,11 @@ const SoccorsoEditPreInstructor = () => {
                                                                style={{ flexDirection: 'row' }}>
                                 <span>{o.label}</span>
                             </li>) : null}
-                            {amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
+                            {!isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
+                                ? amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
                                                                                        style={{ flexDirection: 'row' }}>
                                 <span>{v}</span>
-                            </li>)}
+                            </li>) : null}
                         </ol>
                     </div> : null}