diff --git a/src/store/index.js b/src/store/index.js
index e17acd0d..2e677807 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1591,13 +1591,10 @@ export const useMainStore = defineStore({
             this.order.vehicle.imageVifNumber = vehicle.imageVifNumber;
             this.order.vehicle.imageColor = vehicle.imageVifColor;
 
-            if (vehicle.canSafeliteService) {
-                if (this.isBailout && this.bailoutCode === bailoutCode.HeavyTruckVehicle) {
-                    // reset previously set bailout if vehicle can be serviced.
-                    this.resetBailout();
-                }
-            } else {
+            if (vehicle.canSafeliteService !== undefined && !vehicle.canSafeliteService) {
                 this.setBailout(bailoutMessage.HeavyTruckVehicle(vehicle.carId));
+            } else if (this.isBailout && this.bailoutCode === bailoutCode.HeavyTruckVehicle) {
+                this.resetBailout();
             }
 
             // These could be undefined