diff --git a/src/layouts/part-questions/part-questions.spec.js b/src/layouts/part-questions/part-questions.spec.js
index 268f1febd..4dcbb669c 100644
--- a/src/layouts/part-questions/part-questions.spec.js
+++ b/src/layouts/part-questions/part-questions.spec.js
@@ -306,6 +306,12 @@ describe("partQuestions.vue...", () => {
             //Assert
             expect(spy).toHaveBeenNthCalledWith(
                 1,
+                storeActions.SAVE_IS_OEM_GLASS_SELECTED,
+                false,
+                false
+            );
+            expect(spy).toHaveBeenNthCalledWith(
+                2,
                 "savePartQuestionAnswers",
                 [
                     {
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 5456d868f..958a38095 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -188,6 +188,8 @@ export default {
                 }
             });
 
+            this.dispatchStoreAction(this.storeActions.SAVE_IS_OEM_GLASS_SELECTED, false, false);
+
             // save to vuex store as order.damage.partQuestionAnswers (array)
             // used in GET_PARTS call following this one
             await this.dispatchStoreAction(
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index b8e773d30..55fc1852c 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -198,6 +198,8 @@ export default {
                 false
             );
 
+            this.dispatchStoreAction(this.storeActions.SAVE_IS_OEM_GLASS_SELECTED, false, false);
+
             // Navigate to the next page
             this.navigateForward(matchedParts);
         },