diff --git a/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx
index 168b019ac7ec..f7661ba954ac 100644
--- a/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx
+++ b/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx
@@ -57,8 +57,6 @@ export const Overview = () => {
   const [modalVisible, setModalVisible] = useState<VisibleModal>()
   const lawsBroken = useIndictmentsLawsBroken(workingCase)
 
-  const displayReviewerChoices = workingCase.indictmentReviewer === null
-
   const [selectedDefendant, setSelectedDefendant] = useState<Defendant | null>()
   const { setAndSendDefendantToServer } = useDefendants()
 
@@ -172,51 +170,59 @@ export const Overview = () => {
             <IndictmentCaseFilesList workingCase={workingCase} />
           </Box>
         )}
-        {displayReviewerChoices && (
-          <Box marginBottom={5}>
-            <SectionHeading
-              title={fm(strings.reviewerTitle)}
-              description={
-                <Text variant="eyebrow">
-                  {fm(strings.reviewerSubtitle, {
-                    indictmentAppealDeadline: formatDate(
-                      workingCase.indictmentAppealDeadline,
-                    ),
-                  })}
-                </Text>
+        <Box marginBottom={5}>
+          <SectionHeading
+            title={fm(strings.reviewerTitle)}
+            description={
+              <Text variant="eyebrow">
+                {fm(strings.reviewerSubtitle, {
+                  indictmentAppealDeadline: formatDate(
+                    workingCase.indictmentAppealDeadline,
+                  ),
+                })}
+              </Text>
+            }
+          />
+          <BlueBox>
+            <Select
+              name="reviewer"
+              label={fm(strings.reviewerLabel)}
+              placeholder={fm(strings.reviewerPlaceholder)}
+              value={
+                selectedIndictmentReviewer
+                  ? selectedIndictmentReviewer
+                  : workingCase.indictmentReviewer
+                  ? {
+                      label: workingCase.indictmentReviewer.name || '',
+                      value: workingCase.indictmentReviewer.id,
+                    }
+                  : undefined
               }
+              options={publicProsecutors}
+              onChange={(value) => {
+                setSelectedIndictmentReviewer(value as Option<string>)
+              }}
+              isDisabled={loading}
+              required
             />
-            <BlueBox>
-              <Select
-                name="reviewer"
-                label={fm(strings.reviewerLabel)}
-                placeholder={fm(strings.reviewerPlaceholder)}
-                value={selectedIndictmentReviewer}
-                options={publicProsecutors}
-                onChange={(value) => {
-                  setSelectedIndictmentReviewer(value as Option<string>)
-                }}
-                isDisabled={loading}
-                required
-              />
-            </BlueBox>
-          </Box>
-        )}
+          </BlueBox>
+        </Box>
+      </FormContentContainer>
+      <FormContentContainer isFooter>
+        <FormFooter
+          nextButtonIcon="arrowForward"
+          previousUrl={constants.CASES_ROUTE}
+          nextIsLoading={isLoadingWorkingCase}
+          nextIsDisabled={
+            !selectedIndictmentReviewer ||
+            selectedIndictmentReviewer.value ===
+              workingCase.indictmentReviewer?.id ||
+            isLoadingWorkingCase
+          }
+          onNextButtonClick={assignReviewer}
+          nextButtonText={fm(core.continue)}
+        />
       </FormContentContainer>
-
-      {displayReviewerChoices && (
-        <FormContentContainer isFooter>
-          <FormFooter
-            nextButtonIcon="arrowForward"
-            previousUrl={`${constants.CASES_ROUTE}`}
-            nextIsLoading={isLoadingWorkingCase}
-            nextIsDisabled={!selectedIndictmentReviewer || isLoadingWorkingCase}
-            onNextButtonClick={assignReviewer}
-            nextButtonText={fm(core.continue)}
-          />
-        </FormContentContainer>
-      )}
-
       {modalVisible === 'REVIEWER_ASSIGNED' && (
         <Modal
           title={fm(strings.reviewerAssignedModalTitle)}
@@ -228,7 +234,6 @@ export const Overview = () => {
           onSecondaryButtonClick={() => router.push(constants.CASES_ROUTE)}
         />
       )}
-
       {modalVisible === 'DEFENDANT_VIEWS_VERDICT' && (
         <Modal
           title={fm(strings.defendantViewsVerdictModalTitle)}