diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index db7881527..3d1115000 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -68,12 +68,14 @@ export async function navigateToHeritageFunnel({ shouldSaveSession = true, loadi
 }
 
 export async function skipVinLookup() {
+    if (store.getters.damage.isRepair) {
+        return true;
+    }
     const isVinOptionalVehicle = store.getters.order.vehicle.make
         ? await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE)
         : false;
 
     return (
-        store.getters.damage.isRepair ||
         isVinOptionalVehicle ||
         !includesWindshieldReplacement() ||
         experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")