diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index c47169ed..4cfc914b 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -238,7 +238,11 @@ export default {
             }
             if (!vinLookup.data?.canSafeliteService) {
                     this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(vinLookup.data.carId));
-                    return this.navigateForward();
+                    this.$router.navigate(
+                        this.navigationScenarios.BAILOUT,
+                        this.$route
+                    );
+                return;
             }
             this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vinLookup.data.carId);
             await useMainStore().saveVin(
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 38147f87..a2efafc8 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -170,13 +170,13 @@ export default {
         // NOTE: If form is not valid, this method is not called when 'Continue' button is clicked
         async forwardButtonAction() {
             this.resetActiveAlert();
+            this.mainStore.resetBailout();
             // Temp solution to reset the 'disabled' style on the Continue button
             this.$refs.siteFooter.enableForwardAction();
             showIssLoadingModal(true);
 
             if (this.needToLookupVehicle) {
                 try {
-                    this.mainStore.resetBailout();
                     const vehicleLookupResponse = await this.lookupVehicleByVin(this.vin);
 
                     if (!vehicleLookupResponse.data.canSafeliteService) {