diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index b226a913d..f26ec5ed0 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -143,10 +143,14 @@ export default ({
                 });
         },
         isRepairOptionSelected(){
-            return this.selectedWindshieldDamageTypeValue === damageLocationsSelected.REPAIR && this.isWindshieldDamageLocation;
+            if (!this.selectedWindshieldDamageTypeValues) return false;
+
+            return this.selectedWindshieldDamageTypeValues.some(val => val === damageLocationsSelected.REPAIR) && this.isWindshieldDamageLocation;
         },
         isReplaceOptionSelected(){
-            return this.selectedWindshieldDamageTypeValue === damageLocationsSelected.REPLACE && this.isWindshieldDamageLocation;
+            if (!this.selectedWindshieldDamageTypeValues) return false;
+
+            return this.selectedWindshieldDamageTypeValues.some(val => val === damageLocationsSelected.REPLACE) && this.isWindshieldDamageLocation;
         },
         isWindshieldReplaceAvailable() {
             return !(Array.isArray(this.windshieldAvailableReplacementOptions) && this.windshieldAvailableReplacementOptions.length < 1);