diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index fc684ef63..fa0fc4a73 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -234,13 +234,10 @@ export default {
     },
 
     async forwardButtonAction() {
-      const windshieldChipCount = this.selectedWindshieldOptions.selectedWindshieldChipCount && this.isWindshieldDamageLocation ? 
-         this.selectedWindshieldOptions.selectedWindshieldChipCount[0] : null;
-
       store.commit(this.storeMutations.UPDATE_IS_REPAIR, this.isWindshieldRepair);
 
-      if (this.isWindshieldRepair && windshieldChipCount){
-        store.commit(this.storeMutations.UPDATE_NUMBER_OF_CHIPS, parseInt(windshieldChipCount));
+      if (this.isWindshieldRepair){
+        store.commit(this.storeMutations.UPDATE_NUMBER_OF_CHIPS, parseInt(this.selectedWindshieldOptions.selectedWindshieldChipCount));
       } else {
         store.commit(this.storeMutations.UPDATE_NUMBER_OF_CHIPS, null);
       }