diff --git a/prime-angular-frontend/src/app/modules/enrolment/pages/overview/overview.component.ts b/prime-angular-frontend/src/app/modules/enrolment/pages/overview/overview.component.ts
index 48675d95de..099d349304 100644
--- a/prime-angular-frontend/src/app/modules/enrolment/pages/overview/overview.component.ts
+++ b/prime-angular-frontend/src/app/modules/enrolment/pages/overview/overview.component.ts
@@ -216,7 +216,6 @@ export class OverviewComponent extends BaseEnrolmentPage implements OnInit {
    */
   private getEnrolmentErrors(enrolment: Enrolment): ValidationErrors {
     return {
-      certificate: !enrolment.certifications?.length,
       certificateOrOboSite: !enrolment.certifications?.length && !enrolment.oboSites?.length,
       deviceProvider: enrolment.careSettings.some((careSetting) => careSetting.careSettingCode === CareSettingEnum.DEVICE_PROVIDER)
         && !enrolment.deviceProviderIdentifier,
diff --git a/prime-angular-frontend/src/app/shared/components/enrollee/enrollee-review/enrollee-review.component.html b/prime-angular-frontend/src/app/shared/components/enrollee/enrollee-review/enrollee-review.component.html
index c18a166cfd..c8cc8b0d53 100644
--- a/prime-angular-frontend/src/app/shared/components/enrollee/enrollee-review/enrollee-review.component.html
+++ b/prime-angular-frontend/src/app/shared/components/enrollee/enrollee-review/enrollee-review.component.html
@@ -238,7 +238,7 @@
 
   <app-enrollee-property *ngIf="!hasCertification"
                          title="College Certification"
-                         [hasError]="enrolmentErrors?.certificateOrOboSite && enrolmentErrors?.certificate"
+                         [hasError]="enrolmentErrors?.certificateOrOboSite"
                          errorMessage="Must have a college certificate or job site information"
                          [makeBold]="true">
     None
@@ -318,9 +318,9 @@
                            title="Job Sites"
                            [hasError]="enrolmentErrors?.certificateOrOboSite || enrolmentErrors?.deviceProviderOrOboSite"
                            errorMessage="Must have a {{
-                             enrolmentErrors?.certificate && enrolmentErrors?.deviceProvider
+                            !hasCertification && enrolmentErrors?.deviceProvider
                              ? 'college certificate and a device provider ID'
-                             : enrolmentErrors?.certificate
+                             : !hasCertification
                                 ? 'college certificate'
                                 : 'device provider ID'
                             }} or job site information"