diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 7ee3e773..0b48e930 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -129,6 +129,7 @@ export default {
     vinMask() {
       if (this.vinPopulatedOnPageLoad) {
         this.activeVehicleLookupAlertType = vehicleLookupAlertTypes.PERFECT_MATCH;
+        this.needToLookupVehicle = false;
         const lastSixChars = this.vin.substring(11, this.vin.length);
           return `!X!X!X!X!X!X!X!X!X!X!X${lastSixChars}`;
       } else {
@@ -182,7 +183,6 @@ export default {
           this.activeVehicleLookupAlertType = vehicleLookupAlertTypes.NOT_MATCHED;
         }
         
-
         const vehicleYearMakeModelStyle = `${this.vehicleFromLookup.year} ${this.vehicleFromLookup.make} ${this.vehicleFromLookup.model} ${this.forwardButtonCarStyle}`;
         this.$refs.siteFooter.updateButtonText(`Continue with ${vehicleYearMakeModelStyle}`);
         this.$refs.siteFooter.removeLoader();
@@ -212,7 +212,11 @@ export default {
         return;
       }
 
-      this.mainStore.updateVehicle(this.vehicleFromLookup);
+      // save vehicle to store if it hasn't already been saved
+      if (!this.vinPopulatedOnPageLoad) {
+        this.mainStore.updateVehicle(this.vehicleFromLookup);
+      }
+
       const partsOrQuestionsResponse = await this.getPartsOrQuestions();
       if (partsOrQuestionsResponse.error) {
         // To Do: Need requirement on what to do here