diff --git a/src/fmg-components/cart/cart.spec.js b/src/fmg-components/cart/cart.spec.js
index 6cec9ed3b..f06a49a90 100644
--- a/src/fmg-components/cart/cart.spec.js
+++ b/src/fmg-components/cart/cart.spec.js
@@ -309,40 +309,6 @@ describe("cart.vue", () => {
             expect(found).toBe(true);
         });
 
-        // Service package discount Fee Cart Item
-        test("only if there is service package discount fee for the package, a service package discount cart item should be added to the cart", () => {
-            // Arrange
-            const lineItems = {
-                glassParts: [],
-                supportingItems: [
-                    {
-                        description: null,
-                        id: "bc00294e-6baa-403e-866e-52c267187a15",
-                        kitPrice: 0,
-                        laborAmount: 0,
-                        partNumber: "DISC CASHSAVE70",
-                        partType: "SERVICE PACKAGE DISCOUNT",
-                        salesTax: null,
-                        sellingPrice: -70,
-                    },
-                ],
-                vaps: [],
-                promos: [],
-            };
-
-            const availableVaps = [];
-
-            // Act
-            const { wrapper } = setupMocks({
-                props: {
-                    modelValue: lineItems,
-                    availableVaps: availableVaps,
-                },
-            });
-            // Assert
-            expect(wrapper.vm.servicePackageDiscountCartItem).toBeNull();
-        });
-
         // Other Supporting Items Cart Item
         test("if there are other supporting items on the order, an other supporting items cart item should be added to the cart but should not be displayed", () => {
             // Arrange
diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index e9152dd9d..d1bd2a939 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -312,10 +312,23 @@ export default {
             this.lineItems[category] = this.lineItems[category].filter(
                 (lineItemsToKeep) => lineItemsToKeep.cartItemType != cartItemType
             );
+            let shouldSaveSupportingItems = category == cartItemCategories.SUPPORTING_ITEMS;
             if (category == cartItemCategories.VAPS || category == cartItemCategories.PROMOS) {
                 this.saveVaps(this.lineItems);
+                // Check if service package discount should be removed after vaps change
+                if (
+                    this.servicePackageDiscountCartItem &&
+                    this.discountPackageNames != this.packageLevel
+                ) {
+                    this.lineItems.supportingItems = this.lineItems.supportingItems.filter(
+                        (lineItemsToKeep) =>
+                            lineItemsToKeep.cartItemType !=
+                            this.servicePackageDiscountCartItem.cartItemType
+                    );
+                    shouldSaveSupportingItems = true;
+                }
             }
-            if (category == cartItemCategories.SUPPORTING_ITEMS) {
+            if (shouldSaveSupportingItems) {
                 await this.dispatchStoreAction(
                     storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
                     this.lineItems.supportingItems,
@@ -471,14 +484,7 @@ export default {
                 }
 
                 if (this.servicePackageDiscountCartItem) {
-                    if (this.discountPackageNames != this.packageLevel) {
-                        this.removeItem(
-                            this.servicePackageDiscountCartItem.cartItemType,
-                            cartItemCategories.SUPPORTING_ITEMS
-                        );
-                    } else {
-                        cartItems.push(this.servicePackageDiscountCartItem);
-                    }
+                    cartItems.push(this.servicePackageDiscountCartItem);
                 }
 
                 if (this.premiumAppointmentDiscountCartItem) {