diff --git a/src/common-components/base-input-button/base-input-button.vue b/src/common-components/base-input-button/base-input-button.vue
index bbe92c1d5..91b36c348 100644
--- a/src/common-components/base-input-button/base-input-button.vue
+++ b/src/common-components/base-input-button/base-input-button.vue
@@ -1,6 +1,9 @@
 <template>
     <label
-        :class="[buttonWrapperClasses, { 'has-error': errors.length > 0, selected: isChecked }]"
+        :class="[
+            buttonWrapperClasses,
+            { 'has-error': errors.length > 0 && !suppressError, selected: isChecked },
+        ]"
         :for="buttonId"
         @focusin="handleFocus"
         @focusout="handleBlur"
diff --git a/src/common-components/base-input-button/button-functionality-props.js b/src/common-components/base-input-button/button-functionality-props.js
index 1faa369e2..9a4aef5c9 100644
--- a/src/common-components/base-input-button/button-functionality-props.js
+++ b/src/common-components/base-input-button/button-functionality-props.js
@@ -27,4 +27,5 @@ export const inputButtonProps = {
         type: Boolean,
         default: false,
     },
+    suppressError: Boolean,
 };
diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index b417248a2..646b244be 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -51,6 +51,7 @@
                             :additionalButtonStyling="additionalButtonStyling"
                             :lastValuePushedToGa="lastValuePushedToGa"
                             :setLastValuePushedToGa="setLastValuePushedToGa"
+                            :suppressError="suppressError"
                             v-model="selectedValues" />
                         <!-- For nested questions -->
                         <transition name="fade" mode="out-in">
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 51cd16a3e..35bb104ef 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -118,29 +118,24 @@ export default {
         },
         rearWiperApplicableForTierThree() {
             const rearWiperIsAvailable = this.lineItemsContainsPartType(partTypeStrings.REAR_WIPER);
-            return (
-                this.glassToReplaceContainsGlassLocation(glassLocations.REAR) &&
-                rearWiperIsAvailable
-            );
-        },
-        rainDefenseApplicableForTierThree() {
             const frontWipersAreAvailable = this.lineItemsContainsPartType(
                 partTypeStrings.FRONT_WIPER
             );
-            const glassToReplaceContainsWindshield = this.glassToReplaceContainsGlassLocation(
-                glassLocations.WINDSHIELD
+            return (
+                rearWiperIsAvailable &&
+                (this.glassToReplaceContainsGlassLocation(glassLocations.REAR) ||
+                    !frontWipersAreAvailable)
             );
-            const glassToReplaceContainsRearGlass = this.glassToReplaceContainsGlassLocation(
-                glassLocations.REAR
-            );
-            if (this.frontWipersApplicableForTierTwo) {
-                return true;
-            } else if (!frontWipersAreAvailable) {
-                return true;
-            } else if (!glassToReplaceContainsWindshield && !glassToReplaceContainsRearGlass) {
-                return true;
-            } else {
+        },
+        rainDefenseApplicableForTierThree() {
+            if (
+                this.rearWiperApplicableForTierTwo &&
+                !this.frontWipersApplicableForTierTwo &&
+                this.frontWipersApplicableForTierThree
+            ) {
                 return false;
+            } else {
+                return true;
             }
         },
         shouldDisplayTierTwoPackage() {