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