diff --git a/src/store/index.js b/src/store/index.js
index 574df8012..a094a8a15 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2495,15 +2495,7 @@ export const actions = {
 
     isVinOptionalVehicle(context) {
         //Optional for carIds with only a single windshield
-        if (
-            singleWindshieldCarIds.find((item) => item === context.state.order.vehicle.carId) &&
-            context.state.order.damage.glassToReplace.length == 1 &&
-            context.state.order.damage.glassToReplace.find(
-                (glassToReplace) =>
-                    glassToReplace.glassLocation.toLowerCase() ===
-                    damageLocationsSelected.WINDSHIELD.toLowerCase()
-            )
-        ) {
+        if (singleWindshieldCarIds.find((item) => item === context.state.order.vehicle.carId)) {
             return true;
         }
         //Optional for specific YMMSs
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index e7c004090..8353ec0d8 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -3329,7 +3329,7 @@ describe("isVinOptionalVehicle", () => {
             "CR00062396",
             "make3",
             [{ glassLocation: "windshield" }, { glassLocation: "driver" }],
-            false,
+            true,
         ],
         ["CR00066428", "make4", [{ glassLocation: "rear" }], false],
     ];