diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 32739426f..718f8fc50 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -485,19 +485,13 @@ export default {
                 this.hasGlassLocationWithMultipleParts(allPartsOrQuestions);
             const hasChildPartQuestions = this.hasChildPartQuestions(allPartsOrQuestions);
             const hasCapabilityQuestions = this.hasCapabilityQuestions(allPartsOrQuestions);
-            const skipVinLookup = await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE);
 
             const vin = self.$store.getters.vehicle.vin;
             let backNavigationScenario =
-                !vin || vin === "" || skipVinLookup
+                !vin || vin === ""
                     ? navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS
                     : navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS;
 
-            if (vin) {
-                backNavigationScenario =
-                    navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS;
-            }
-
             if (
                 hasCapabilityQuestions &&
                 this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)