diff --git a/src/components/ChallengeEditor/ChallengeReviewer-Field/AiReviewerTab/components/ReviewSettingsSection.js b/src/components/ChallengeEditor/ChallengeReviewer-Field/AiReviewerTab/components/ReviewSettingsSection.js
index 5c7de43c..4b1c589e 100644
--- a/src/components/ChallengeEditor/ChallengeReviewer-Field/AiReviewerTab/components/ReviewSettingsSection.js
+++ b/src/components/ChallengeEditor/ChallengeReviewer-Field/AiReviewerTab/components/ReviewSettingsSection.js
@@ -21,7 +21,7 @@ const ReviewSettingsSection = ({ configuration, onUpdateConfiguration, readOnly,
             className={styles.modeDropdown}
           >
             <option value='AI_GATING'>AI_GATING</option>
-            <option value='AI_ONLY'>AI_ONLY</option>
+            {/* <option value='AI_ONLY'>AI_ONLY</option> */}
           </select>
           <p className={styles.modeInfo}>
             {configuration.mode === 'AI_GATING'
diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js
index 6326d8c7..3d21e062 100644
--- a/src/components/ChallengeEditor/index.js
+++ b/src/components/ChallengeEditor/index.js
@@ -2053,6 +2053,7 @@ class ChallengeEditor extends Component {
                   const hasRealAiScreeningPhase = phases.some(p => p.name === AI_SCREENING_PHASE_NAME)
                   const showVirtualAiScreening = hasAiReviewers(challenge.reviewers) && !hasRealAiScreeningPhase
                   const submissionIndex = phases.findIndex(p => p.name === 'Submission')
+                  const checkpointSubmissionIndex = phases.findIndex(p => p.name === 'Checkpoint Submission')
                   return (
                     <>
                       {phases.map((phase, index) => (
@@ -2065,7 +2066,7 @@ class ChallengeEditor extends Component {
                               this.onUpdatePhaseDate(item, index)
                             }}
                           />
-                          {showVirtualAiScreening && index === submissionIndex && (
+                          {showVirtualAiScreening && (index === submissionIndex || index === checkpointSubmissionIndex) && (
                             <PhaseInput
                               phase={{ name: AI_SCREENING_PHASE_NAME }}
                               readOnly
@@ -2074,7 +2075,7 @@ class ChallengeEditor extends Component {
                           )}
                         </React.Fragment>
                       ))}
-                      {showVirtualAiScreening && submissionIndex === -1 && (
+                      {showVirtualAiScreening && (submissionIndex === -1 || checkpointSubmissionIndex === -1) && (
                         <PhaseInput
                           phase={{ name: AI_SCREENING_PHASE_NAME }}
                           readOnly