diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index f26ec5ed0..e3524e3f0 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="windshield-options">
         <windshieldDamageTypeQuestion cmsWidgetName="WindshieldDamageTypeQuestion"
-            :isAvailable=isWindshieldDamageLocation
+            :isAvailable="isWindshieldDamageLocation"
             :suppressError="hasRepairReplaceConflict || showNoReplacementAvailableError"
             groupName="WindshieldDamageTypeQuestion"
             v-model="selectedWindshieldDamageTypeValue"
@@ -13,7 +13,7 @@
             cmsWidgetName="NoReplacementAvailableError"
             alertClass="alert-danger"
             :isDismissible="false"
-          />
+        />
         <windshieldChipCountQuestion cmsWidgetName="WindshieldChipCountQuestion"
             :isAvailable="isRepairOptionSelected && !hasRepairReplaceConflict"
             groupName="WindshieldChipCountQuestion"
@@ -137,20 +137,17 @@ export default ({
             }
         },
         isWindshieldDamageLocation() {
-            return this.selectedDamageLocations.some(selectedDamages =>
-                {
-                    return Boolean(selectedDamages.toUpperCase() === "WINDSHIELD");
-                });
+            return this.selectedDamageLocations.some(selectedDamageLocation => selectedDamageLocation === damageLocationsSelected.WINDSHIELD);
         },
         isRepairOptionSelected(){
-            if (!this.selectedWindshieldDamageTypeValues) return false;
+            if (!this.selectedWindshieldDamageTypeValue) return false;
 
-            return this.selectedWindshieldDamageTypeValues.some(val => val === damageLocationsSelected.REPAIR) && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValue === damageLocationsSelected.REPAIR && this.isWindshieldDamageLocation;
         },
         isReplaceOptionSelected(){
-            if (!this.selectedWindshieldDamageTypeValues) return false;
+            if (!this.selectedWindshieldDamageTypeValue) return false;
 
-            return this.selectedWindshieldDamageTypeValues.some(val => val === damageLocationsSelected.REPLACE) && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValue === damageLocationsSelected.REPLACE && this.isWindshieldDamageLocation;
         },
         isWindshieldReplaceAvailable() {
             return !(Array.isArray(this.windshieldAvailableReplacementOptions) && this.windshieldAvailableReplacementOptions.length < 1);