diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 5d72e2f..6be4f55 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -157,8 +157,8 @@ const DomandaEditInstructorManager = () => {
             if (formFieldsChecklist.length >= minChecks) {
                 const valuesTotal = formFieldsChecklist.map(v => formValues[v]);
                 const valuesFirst = valuesTotal.toSpliced(minChecks);
-                setAtLeastOneChecked(valuesTotal.filter(v => v === true).length === valuesTotal.length);
-                setAllChecksChecked(valuesFirst.filter(v => v === true).length === valuesFirst.length)
+                setAtLeastOneChecked(valuesFirst.filter(v => Boolean(v) === true).length === valuesFirst.length);
+                setAllChecksChecked(valuesTotal.filter(v => Boolean(v) === true).length === valuesTotal.length);
             }
         }
     }, [formValues]);
@@ -739,7 +739,7 @@ const DomandaEditInstructorManager = () => {
         if (data.evaluationVersion === 'V1') {
             return !allFilesRated || !atLeastOneChecked;
         } else if (data.evaluationVersion === 'V2') {
-            return !allFilesRated || !atLeastOneChecked;
+            return !atLeastOneChecked;
         } else {
             return true;
         }
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 807853a..2be4553 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -158,8 +158,8 @@ const DomandaEditPreInstructor = () => {
             if (formFieldsChecklist.length >= minChecks) {
                 const valuesTotal = formFieldsChecklist.map(v => formValues[v]);
                 const valuesFirst = valuesTotal.toSpliced(minChecks);
-                setAtLeastOneChecked(valuesTotal.filter(v => v === true).length === valuesTotal.length);
-                setAllChecksChecked(valuesFirst.filter(v => v === true).length === valuesFirst.length)
+                setAtLeastOneChecked(valuesFirst.filter(v => Boolean(v) === true).length === valuesFirst.length);
+                setAllChecksChecked(valuesTotal.filter(v => Boolean(v) === true).length === valuesTotal.length);
             }
         }
     }, [formValues]);
@@ -736,12 +736,12 @@ const DomandaEditPreInstructor = () => {
         const userData = storeGet.main.userData()
         return isAsyncRequest || userData.id !== data.assignedUserId;
     }
-    
+
     const shouldDisableNewSoccorso = () => {
         if (data.evaluationVersion === 'V1') {
             return !allFilesRated || !atLeastOneChecked;
         } else if (data.evaluationVersion === 'V2') {
-            return !allFilesRated || !atLeastOneChecked;
+            return !atLeastOneChecked;
         } else {
             return true;
         }