diff --git a/src/layouts/policy-vehicles/policy-vehicles.vue b/src/layouts/policy-vehicles/policy-vehicles.vue
index fb5da45a..c2a0741b 100644
--- a/src/layouts/policy-vehicles/policy-vehicles.vue
+++ b/src/layouts/policy-vehicles/policy-vehicles.vue
@@ -231,7 +231,9 @@ export default {
                             {},
                             {}
                         );
-                } else if (this.endorsementsForSelectedVehicle?.length > 0) {
+                } else if (this.endorsementsForSelectedVehicle?.length > 0
+                    && (this.endorsementsForSelectedVehicle?.includes(endorsementOptions.PARKING_GUARD)
+                    || this.endorsementsForSelectedVehicle?.includes(endorsementOptions.EDUCATOR))) {
                     this.$router.navigate(
                         this.navigationScenarios.CLICKED_FORWARD_WITH_ENDORSEMENTS,
                         this.$route