diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index f898c9276..8f6cad4eb 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -442,10 +442,7 @@ export default {
                 const collectedGlassParts = this.reducedGlassPartsArray(partsOrQuestions);
 
                 // save to store lineItems.glassParts
-                await baseMixin.methods.dispatchStoreAction(
-                    storeActions.SAVE_GLASS_PARTS,
-                    collectedGlassParts
-                );
+                self.$store.dispatch(storeActions.SAVE_GLASS_PARTS, collectedGlassParts);
 
                 const payment = store.getters.payment;
 
diff --git a/src/store/index.js b/src/store/index.js
index b12f99ac4..570f884b5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1776,7 +1776,7 @@ export const actions = {
     },
 
     saveSupportingItems(context, supportingItems) {
-        if (!deepEqual(supportingItems, context.getters.order.lineItems.supportingItems)) {
+        if (!deepEqual(supportingItems, context.state.order.lineItems.supportingItems)) {
             context.commit(storeMutations.RESET_SERVICE_LOCATION_APPOINTMENT_TYPE);
             context.commit(storeMutations.RESET_SERVICE_LOCATION_PROVIDER);
         }