diff --git a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
index 44ff5a6ed..512d0f577 100644
--- a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
+++ b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
@@ -53,7 +53,6 @@ export default {
     props: {
         cmsWidgetName: String,
         lineItems: Array,
-        activePromos: null,
     },
     data() {
         return {};
@@ -78,7 +77,7 @@ export default {
         },
         afterpayPrice() {
             let allLineItems = getArrayOfAllLineItems(this.lineItems);
-            if (this.activePromos) {
+            if (this.lineItems.promos) {
                 allLineItems = allLineItems?.filter((item) => item.partType !== "PROMO_DISCOUNT");
             }
 
@@ -91,9 +90,12 @@ export default {
                 price += baseMixin.methods.getTotalLineItemPrice(lineItem);
             });
 
-            if (this.activePromos) {
+            if (this.lineItems.promos) {
                 let allLineItems = getArrayOfAllLineItems(this.lineItems);
-                const promos = getPromosThatMatchLineItemsOnOrder(this.activePromos, allLineItems);
+                const promos = getPromosThatMatchLineItemsOnOrder(
+                    this.lineItems.promos,
+                    allLineItems
+                );
                 promos.forEach((promo) => {
                     price += baseMixin.methods.getTotalLineItemPrice(promo);
                 });
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 212378d03..8f9d256e0 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -44,7 +44,6 @@
                 <div class="col-md-6 col-xl-4">
                     <afterpayModalBanner
                         v-if="!isInsuranceSelected && !isRecalibrationOnOrder"
-                        :activePromos="lineItems.promos"
                         cmsWidgetName="AfterpayModalWidget"
                         :lineItems="lineItems" />
 
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 d9d0bc6dc..c4e73b451 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -75,31 +75,23 @@ export default {
             const servicePackageDiscountPartInSelectedPackage =
                 this.getServicePackageDiscountPartForSelectedPackage(newValue);
             let supportingItems = this.supportingLineItems;
-            if (servicePackageDiscountPartInSelectedPackage?.length > 0) {
-                if (
-                    containsLineItemWithPartType(
-                        partTypeStrings.SERVICE_PACKAGE_DISCOUNT,
-                        supportingItems
-                    )
-                ) {
-                    supportingItems = supportingItems.filter(
-                        (item) => item.partType !== partTypeStrings.SERVICE_PACKAGE_DISCOUNT
-                    );
-                }
-                supportingItems?.push(servicePackageDiscountPartInSelectedPackage[0]);
-            } else {
-                if (
-                    supportingItems?.length > 0 &&
-                    containsLineItemWithPartType(
-                        partTypeStrings.SERVICE_PACKAGE_DISCOUNT,
-                        supportingItems
-                    )
-                ) {
-                    supportingItems = supportingItems.filter(
-                        (item) => item.partType !== partTypeStrings.SERVICE_PACKAGE_DISCOUNT
-                    );
-                }
+            if (
+                containsLineItemWithPartType(
+                    partTypeStrings.SERVICE_PACKAGE_DISCOUNT,
+                    supportingItems
+                )
+            ) {
+                supportingItems = supportingItems.filter(
+                    (item) => item.partType !== partTypeStrings.SERVICE_PACKAGE_DISCOUNT
+                );
             }
+            if (
+                servicePackageDiscountPartInSelectedPackage?.length > 0 &&
+                supportingItems != null
+            ) {
+                supportingItems.push(servicePackageDiscountPartInSelectedPackage[0]);
+            }
+
             this.$emit("servicePackageDiscountSelected", supportingItems);
         },
     },