diff --git a/src/layouts/policy-vehicles/policy-vehicles.vue b/src/layouts/policy-vehicles/policy-vehicles.vue
index efd7777b..ea683c21 100644
--- a/src/layouts/policy-vehicles/policy-vehicles.vue
+++ b/src/layouts/policy-vehicles/policy-vehicles.vue
@@ -73,9 +73,7 @@ export default {
         });
     },
     data() {
-        const policyVehicles = useMainStore().pageData(issPageValues.POLICY_VEHICLES);
         return {
-            policyVehicles,
             selectedVehicleVin: '',
             displayGeneric: true,
             bailout: false,
@@ -87,7 +85,7 @@ export default {
     computed: {
         VehiclesForQuestions() {
             // Map API result data, to address-vehicles data structure
-            const vehicles = this.policyVehicles;
+            const vehicles = this.VehiclesFromApi;
             const mappedData = vehicles?.map((v) => {
                 const maskSymbol = 'X';
                 const vinStart = maskSymbol.repeat(v.vin.length - 6);
@@ -103,13 +101,13 @@ export default {
             return mappedData;
         },
         noCoverageForSelectedVehicle() {
-            const vehicle = this.policyVehicles.find((policyVehicle) =>
-                policyVehicle.vin === this.selectedVehicleVin);
+            const vehicle = this.VehiclesFromApi?.find((vehicleFromApi) =>
+                vehicleFromApi.vin === this.selectedVehicleVin);
             return (vehicle?.coverages?.length ?? 0) === 0;
         },
         deductibleForSelectedVehicle() {
-            const vehicle = this.policyVehicles.find((policyVehicle) =>
-                policyVehicle?.vin === this.selectedVehicleVin);
+            const vehicle = this.VehiclesFromApi?.find((vehicleFromApi) =>
+                vehicleFromApi?.vin === this.selectedVehicleVin);
             if (!vehicle) {
                 return undefined;
             }
@@ -119,8 +117,8 @@ export default {
                 : 0;
         },
         repairWaivedForSelectedVehicle() {
-            const vehicle = this.policyVehicles.find((policyVehicle) =>
-                policyVehicle.vin === this.selectedVehicleVin);
+            const vehicle = this.VehiclesFromApi?.find((vehicleFromApi) =>
+                vehicleFromApi.vin === this.selectedVehicleVin);
             return vehicle?.endorsements?.includes(endorsementOptions.REPAIR_WAIVED) ?? false;
         },
         VehiclesFromApi() {