diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index d291661..6f27ef3 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -1119,7 +1119,7 @@ const DomandaEditInstructorManager = () => {
                     disabled={!isAdmissible
                         || ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
                         || evaluationBlockedForUser(data)
-                        || (APP_EVALUATION_FLOW_ID === '1' && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus))
+                        || (APP_EVALUATION_FLOW_ID === '1' && !['AWAITING_TECHNICAL_EVALUATION'].includes(data.applicationStatus))
                         || connectedSoccorsoId !== 0
                     }
                     onClick={initiateApproving}
@@ -1129,10 +1129,7 @@ const DomandaEditInstructorManager = () => {
                 ? <Button
                     type="button"
                     disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
-                        || (APP_EVALUATION_FLOW_ID === '1'
-                            && (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
-                                || evaluationBlockedForUser(data)))
-                    }
+                        || evaluationBlockedForUser(data)}
                     onClick={initiateRejecting}
                     label={__('Respingi domanda', 'gepafin')}
                     icon="pi pi-times" iconPos="right"/> : null}
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 807b314..23cf7e2 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -1119,7 +1119,7 @@ const DomandaEditPreInstructor = () => {
                     disabled={!isAdmissible
                         || ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
                         || evaluationBlockedForUser(data)
-                        || (APP_EVALUATION_FLOW_ID === '1' && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus))
+                        || (APP_EVALUATION_FLOW_ID === '1' && !['AWAITING_TECHNICAL_EVALUATION'].includes(data.applicationStatus))
                         || connectedSoccorsoId !== 0
                     }
                     onClick={initiateApproving}
@@ -1129,10 +1129,7 @@ const DomandaEditPreInstructor = () => {
                 ? <Button
                     type="button"
                     disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
-                        || (APP_EVALUATION_FLOW_ID === '1'
-                            && (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
-                                || evaluationBlockedForUser(data)))
-                    }
+                        || evaluationBlockedForUser(data)}
                     onClick={initiateRejecting}
                     label={__('Respingi domanda', 'gepafin')}
                     icon="pi pi-times" iconPos="right"/> : null}
diff --git a/src/pages/SoccorsoEditInstructorManager/index.js b/src/pages/SoccorsoEditInstructorManager/index.js
index 3ada3bb..256e0e8 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])
+                && amendmentRequestedDocs[data.amendmentDocumentType]  && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <ol className="appPageSection__list">
diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js
index 068cf2d..e58976a 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])
+                && amendmentRequestedDocs[data.amendmentDocumentType] && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <ol className="appPageSection__list">