diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index f358fc89f..bec7c9a39 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -33,6 +33,7 @@ const experimentSettings = {
     SHOW_PM_MOBILE_DAYS: "Show_PMmobileDays",
     SHOW_NO_PM_MOBILE_DAYS: "Show_NoPMmobileDays",
     SHOW_NO_MOBILE_AVAILABLE_DAYS: "Show_NoMobileAvailableDays",
+    OFFER_OEM: "OfferOem",
 };
 
 const experimentTriggers = {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 5b874ad0c..b08e9ed72 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -220,11 +220,17 @@ export default {
         );
 
         // call API oem-after-market-parts method
-        const oemAfterMarketParts = baseMixin.methods.dispatchStoreActionWithLogging(
-            storeActions.GET_OEM_AFTERMARKET_PARTS,
-            null,
-            "quote"
+        const offerOem = experimentMixin.methods.hasSettingEqualTo(
+            experimentSettings.OFFER_OEM,
+            "true"
         );
+        if (offerOem) {
+            const oemAfterMarketParts = baseMixin.methods.dispatchStoreActionWithLogging(
+                storeActions.GET_OEM_AFTERMARKET_PARTS,
+                null,
+                "quote"
+            );
+        }
 
         const shouldExposeSkipQuote = store.getters.isRecalibrationOnOrder;
         const skipQuoteExperiment = store.getters.applicationUser.experiments.find(
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 80443d79d..c0bdb7e68 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1655,6 +1655,8 @@ export default {
             this.updateSelectedProvider();
         },
         updateSelectedProvider(newShopProvider) {
+            if (!this.appointmentTypeStrings) return;
+
             if (newShopProvider) {
                 this.selectedProvider = newShopProvider;
             } else if (this.appointmentType === this.appointmentTypeStrings.MOBILE) {
diff --git a/src/store/index.js b/src/store/index.js
index b94fe17a8..409818a40 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1877,9 +1877,11 @@ export const actions = {
         });
 
         // Flatten location and name properties
-        response.data.glassPieceParts = convertGlassPieceNamingFromApi(
-            response.data.glassPieceParts
-        );
+        if (response?.data?.glassPieceParts) {
+            response.data.glassPieceParts = convertGlassPieceNamingFromApi(
+                response.data.glassPieceParts
+            );
+        }
 
         return response;
     },