diff --git a/src/layouts/review/review-sections/damage-review/damage-review.vue b/src/layouts/review/review-sections/damage-review/damage-review.vue
index e0972aa09..ecc7ec98d 100644
--- a/src/layouts/review/review-sections/damage-review/damage-review.vue
+++ b/src/layouts/review/review-sections/damage-review/damage-review.vue
@@ -58,12 +58,9 @@ export default {
             ];
         },
         hasWindshieldDamage() {
-            return (
-                this.damage.isRepair ||
-                this.damage.glassToReplace?.some(
-                    (glass) => glass.glassLocation === damageLocationsSelected.WINDSHIELD
-                )
-            );
+            const windshieldPieces = this.getGlassPieces(damageLocationsSelected.WINDSHIELD);
+
+            return this.damage.isRepair || !!windshieldPieces?.length;
         },
         hasDriverSideDamage() {
             const driverPieces = this.getGlassPieces(damageLocationsSelected.DRIVER);