diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 90c1adf98..0dffbd6de 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -305,8 +305,8 @@ export default {
             if (!this.lineItems || this.lineItems.length < 1) return;
 
             const lineItemsCopy = deepClone(this.lineItems);
-            lineItemsCopy.supportingItems = lineItemsCopy.supportingItems
-                ? baseMixin.methods.filterOutRecalibration(lineItemsCopy?.supportingItems)
+            lineItemsCopy.glassParts = lineItemsCopy.glassParts
+                ? baseMixin.methods.filterOutRecalibration(lineItemsCopy?.glassParts)
                 : [];
             return lineItemsCopy;
         },
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index ff7e6a8d8..2c458e124 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -153,6 +153,7 @@ import { partTypeStrings } from "@/constants/part-type-strings";
 import { mapTaxedLineItemsToStoreFormat } from "../../store";
 import { coverageStatus } from "@/constants/insurance";
 import { containsLineItemWithPartType } from "@/helpers/service-package-helper";
+import { containsRecalParts } from "@/helpers/recal-helper";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
@@ -588,10 +589,11 @@ export default {
     },
     computed: {
         isRecalibrationOnOrder() {
-            return containsLineItemWithPartType(
-                partTypeStrings.RECALIBRATION,
-                this.$store.getters.order.lineItems?.supportingItems
-            );
+            const order = baseMixin.methods.hasSubmittedOrder()
+                ? baseMixin.methods.getSubmittedOrder()
+                : this.$store.getters.order;
+
+            return containsRecalParts(order.lineItems);
         },
         shouldHideRecalibration() {
             return this.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE);
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index c1e60d16a..669e3306f 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -8,6 +8,7 @@ import { queryStrings } from "@/constants/query-strings";
 import { dynamicStrings } from "@/constants/dynamic-strings";
 import { partTypeStrings } from "../constants/part-type-strings";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
+import { getItemsWithoutRecalParts } from "@/helpers/recal-helper";
 
 export default {
     data() {
@@ -103,10 +104,7 @@ export default {
             return filteredLineItems;
         },
         filterOutRecalibration(lineItems) {
-            const filteredLineItems = lineItems.filter((item) => {
-                return !item.partType.includes(partTypeStrings.RECALIBRATION);
-            });
-            return filteredLineItems;
+            return getItemsWithoutRecalParts(lineItems);
         },
         getTotalPriceOfAllLineItemsAndChildParts(lineItems, includeTax) {
             let totalPrice = 0;
diff --git a/src/store/index.js b/src/store/index.js
index 8a87018d6..f6751bcef 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2422,8 +2422,9 @@ export const actions = {
         }));
 
         const order = context.getters.order;
-        
-        var providerNumber = order.serviceLocation?.provider?.providerNumber ?? order.serviceLocation?.zipCodeCtu;
+
+        var providerNumber =
+            order.serviceLocation?.provider?.providerNumber ?? order.serviceLocation?.zipCodeCtu;
         if (providerNumber.startsWith("00") && providerNumber.length > 5) {
             providerNumber = providerNumber.substring(1);
         }