diff --git a/src/layouts/policy-vehicles/policy-vehicles.vue b/src/layouts/policy-vehicles/policy-vehicles.vue
index 5251385e..cc35fd73 100644
--- a/src/layouts/policy-vehicles/policy-vehicles.vue
+++ b/src/layouts/policy-vehicles/policy-vehicles.vue
@@ -85,7 +85,6 @@ export default {
         return {
             policyVehicles,
             selectedVehicleVin: '',
-            selectedPolicyVehicle: null,
             displayGeneric: true,
             policyVinFound: true,
             rules: {
@@ -112,6 +111,13 @@ export default {
                 }) ?? [];
             return mappedData;
         },
+        selectedPolicyVehicle() {
+            if (this.selectedVehicleVin !== vehicleSelectionOptions.VEHICLE_NOT_LISTED) {
+                return this.policyVehicles.find((p) => p.vin === this.selectedVehicleVin);
+            }
+
+            return null;
+        },
         noCoverageForSelectedVehicle() {
             return noCoverageForSelectedVehicle(this.selectedPolicyVehicle);
         },
@@ -135,7 +141,6 @@ export default {
                 // clear previously selected vehicle and image
                 this.mainStore.resetVehicleState();
                 this.displayGeneric = true;
-                this.selectedPolicyVehicle = null;
             } else {
                 // get vehicle details from selected VIN
                 const vehicle = await this.lookupVehicleByVin(value);
@@ -144,13 +149,11 @@ export default {
                 if (vehicle?.error === true) {
                     this.mainStore.resetVehicleState();
                     this.displayGeneric = true;
-                    this.selectedPolicyVehicle = null;
                     return;
                 }
                 if (vehicle) {
                     // save selected vehicle to the store
                     this.displayGeneric = false;
-                    this.selectedPolicyVehicle = this.policyVehicles.find((p) => p.vin === value);
                     useMainStore().updateVehicle({
                         ...vehicle.data,
                         policyVehicleId: this.selectedPolicyVehicle?.id,