diff --git a/src/constants/vehicle-lookup-alert-types.js b/src/constants/vehicle-lookup-alert-types.js
index 551ebe0a..d2d88ee5 100644
--- a/src/constants/vehicle-lookup-alert-types.js
+++ b/src/constants/vehicle-lookup-alert-types.js
@@ -1,6 +1,7 @@
 const vehicleLookupAlertTypes = Object.freeze({
     NOT_FOUND: 'notFound',
     NOT_MATCHED: 'notMatched',
+    NO_SERVICE: 'noService',
     TWO_IDENTICAL_YMM_MATCHED: 'twoIdenticalYMMMatched',
     PERFECT_MATCH: 'perfectMatch'
 });
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 917c95b5..5a7b9b14 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -252,7 +252,8 @@ export default {
                 const carFound = carsFound[0].vehicle;
 
                 if (!carFound.canSafeliteService) {
-                    return this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(carFound.carId));
+                    this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(carFound.carId));
+                    return this.$router.push({ name: 'bailout' });
                 }
 
                 this.isCarIdDifferent = carFound.carId !== useMainStore().order.vehicle.carId;
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 68622f7f..ce7cfb2d 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -257,7 +257,11 @@ export default {
             // Vehicle found from VIN lookup
             const vehicleFromLookup = vinLookupResponse.data.vehicle;
             if (!vehicleFromLookup.canSafeliteService) {
-                return this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(vehicleFromLookup.carId));
+                this.mainStore.setBailout({
+                    type: 'HeavyTruckVehicle',
+                    carId: vehicleFromLookup.carId
+                });
+                return this.navigateForward();
             }
 
             // Check if the CarId has changed
diff --git a/src/layouts/policy-vehicles/policy-vehicles.vue b/src/layouts/policy-vehicles/policy-vehicles.vue
index c98f91bb..019c0059 100644
--- a/src/layouts/policy-vehicles/policy-vehicles.vue
+++ b/src/layouts/policy-vehicles/policy-vehicles.vue
@@ -188,7 +188,9 @@ export default {
                 const vehicleLookupResponse = await this.lookupVehicleByVin(this.selectedVehicleVin);
 
                 if (!vehicleLookupResponse?.data.canSafeliteService) {
-                    this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(this.mainStore.order.vehicle.carId));
+                    this.mainStore.setBailout(
+                        bailoutMessage.HeavyTruckVehicle(vehicleLookupResponse?.data?.carId)
+                    );
                 }
                 useMainStore().updateVehicle({
                     ...vehicleLookupResponse.data,
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index d9b90d96..e7470aca 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -181,6 +181,8 @@ export default {
                     if (!vehicleLookupResponse.data.canSafeliteService) {
                         this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(vehicleLookupResponse.data.carId));
                         this.resetVehicleFromLookup();
+                        showIssLoadingModal(false);
+                        return;
                     }
 
                     // Add vin bcs the response from the service doesn't contain vin