diff --git a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
index 47b2eb207..cbbb51ceb 100644
--- a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
+++ b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
@@ -269,7 +269,10 @@ export default {
             if (!this.frontWipersInCart) {
                 if (!this.rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) {
                     result = wipersOfferedStrings.BOTH;
-                } else {
+                } else if (
+                    !this.frontWipersInCart &&
+                    this.wipersModal?.frontWiperLineItems.length > 0
+                ) {
                     result = wipersOfferedStrings.FRONT;
                 }
             } else if (!this.rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) {
@@ -289,6 +292,10 @@ export default {
             };
 
             const modalData = getAnswer("WipersModal", this.answersCmsData);
+
+            // remove custom var for now
+            modalData.Text = modalData.Text?.replaceAll("{custom:WIPERTYPE}", "");
+
             if (this.wipersOffered === wipersOfferedStrings.BOTH) {
                 // NO REAR WIPERS or FRONT WIPERS IN CART; SHOW COMBO BUTTON
                 const prices = [
@@ -334,8 +341,8 @@ export default {
                 "AddRearBladesQuestionWidget",
                 "QuestionText"
             );
-            const frontWipersLineItems = this.wipersModal.frontWiperLineItems;
-            const rearWipersLineItems = this.wipersModal.rearWiperLineItems;
+            const frontWipersLineItems = this.wipersModal?.frontWiperLineItems;
+            const rearWipersLineItems = this.wipersModal?.rearWiperLineItems;
 
             if (frontWipersLineItems) {
                 const wipersOption = {