diff --git a/app/utils/CheckYourAnswersValidator.scala b/app/utils/CheckYourAnswersValidator.scala
index 6ef1b87b..d7da7795 100644
--- a/app/utils/CheckYourAnswersValidator.scala
+++ b/app/utils/CheckYourAnswersValidator.scala
@@ -57,16 +57,14 @@ sealed trait AddFIValidator {
 
   private[utils] def checkAddressMissingAnswers: Seq[Page] = (userAnswers.get(WhereIsFIBasedPage) match {
     case Some(true) =>
-      checkPage(PostcodePage)
-        .orElse(
-          any(
-            checkPage(SelectedAddressLookupPage),
-            checkPage(UkAddressPage),
-            checkPage(IsThisAddressPage)
-          ).map(
-            _ => PostcodePage
-          )
-        )
+      any(
+        checkPage(PostcodePage),
+        checkPage(SelectedAddressLookupPage),
+        checkPage(UkAddressPage),
+        checkPage(IsThisAddressPage)
+      ).map(
+        _ => PostcodePage
+      )
     case Some(false) => checkPage(NonUkAddressPage)
     case _           => Some(WhereIsFIBasedPage)
   }).toSeq
diff --git a/test-utils/generators/UserAnswersGenerator.scala b/test-utils/generators/UserAnswersGenerator.scala
index 071286cf..c84a2d80 100644
--- a/test-utils/generators/UserAnswersGenerator.scala
+++ b/test-utils/generators/UserAnswersGenerator.scala
@@ -274,16 +274,13 @@ trait UserAnswersGenerator extends UserAnswersEntryGenerators with TryValues {
     missingAnswersArb(
       fiNotRegistered,
       Seq(
+        NameOfFinancialInstitutionPage,
         FirstContactEmailPage,
         FirstContactHavePhonePage,
         FirstContactNamePage,
         FirstContactPhoneNumberPage,
         HaveGIINPage,
         HaveUniqueTaxpayerReferencePage,
-        IsThisAddressPage,
-        PostcodePage,
-        SelectAddressPage,
-        UkAddressPage,
         WhatIsGIINPage,
         WhatIsUniqueTaxpayerReferencePage,
         WhereIsFIBasedPage,
diff --git a/test/utils/CheckYourAnswersValidatorSpec.scala b/test/utils/CheckYourAnswersValidatorSpec.scala
index 1617cd0d..a260bc20 100644
--- a/test/utils/CheckYourAnswersValidatorSpec.scala
+++ b/test/utils/CheckYourAnswersValidatorSpec.scala
@@ -44,6 +44,7 @@ class CheckYourAnswersValidatorSpec extends AnyFreeSpec with Matchers with Model
             val result = CheckYourAnswersValidator(userAnswers).validate
             result mustNot be(empty)
             Set(
+              NameOfFinancialInstitutionPage,
               FirstContactEmailPage,
               FirstContactHavePhonePage,
               FirstContactNamePage,
@@ -53,6 +54,8 @@ class CheckYourAnswersValidatorSpec extends AnyFreeSpec with Matchers with Model
               IsThisAddressPage,
               PostcodePage,
               SelectAddressPage,
+              SelectedAddressLookupPage,
+              NonUkAddressPage,
               UkAddressPage,
               WhatIsGIINPage,
               WhatIsUniqueTaxpayerReferencePage,