diff --git a/src/store/index.js b/src/store/index.js
index ca24e8287..2fa749968 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -122,6 +122,7 @@ const getDefaultState = () => {
                 capabilityQuestionAnswers: null,
                 dateOfLoss: null,
                 damageCause: null,
+                installOemGlass: null,
             },
             lineItems: {
                 glassParts: null,
@@ -190,7 +191,6 @@ const getDefaultState = () => {
             settledTenderAmount: 0,
             isRecalAckOptIn: false,
             isMSRFeeApplicable: false,
-            isOemGlassSelected: false,
         },
         applicationUser: {
             eventBus: [],
@@ -344,7 +344,7 @@ export const mutations = {
         state.order.isRecalAckOptIn = isRecalAckOptIn;
     },
     updateIsOemGlassSelected(state, isOemGlassSelected) {
-        state.order.isOemGlassSelected = isOemGlassSelected;
+        state.order.damage.installOemGlass = isOemGlassSelected;
     },
     updateIsMSRFeeApplicable(state, isMSRFeeApplicable) {
         state.order.isMSRFeeApplicable = isMSRFeeApplicable;
@@ -678,7 +678,6 @@ export const mutations = {
         state.order.eon = sessionInformation.order.eon;
         state.order.customerPortalLoginToken = sessionInformation.order.CustomerPortalLoginToken;
         state.order.isRecalAckOptIn = sessionInformation.order.isRecalAckOptIn;
-        state.order.isOemGlassSelected = sessionInformation.order.isOemGlassSelected;
 
         if (state.order.vehicle.vin !== sessionInformation.order.vehicle?.vin) {
             state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
@@ -717,6 +716,8 @@ export const mutations = {
         state.order.damage.capabilityQuestionAnswers =
             sessionInformation.order.damage.capabilityQuestionAnswers;
 
+        state.order.damage.installOemGlass = sessionInformation.order.damage.installOemGlass;
+
         state.order.lineItems.glassParts = sessionInformation.order.lineItems.glassParts;
         state.order.lineItems.supportingItems = sessionInformation.order.lineItems.supportingItems;
         state.order.lineItems.vaps = sessionInformation.order.lineItems.vaps ?? [];
@@ -1858,7 +1859,7 @@ export const actions = {
         const serviceType = order.serviceLocation?.appointmentType;
         const referralSeqNumber = order.referralSequenceNumber;
         const parentAccountNumber = applicationConfig.CASH_PARENT_ACCOUNT_NUMBER;
-        const oemEndorsementFlag = order.isOemGlassSelected;
+        const oemEndorsementFlag = order.damage.installOemGlass;
         // create a new array to avoid mutating state
         const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
         const resultsArrayForPayload = convertResultsForApi(resultsArray);
@@ -2457,6 +2458,7 @@ export const actions = {
                         partQuestionAnswers: order.damage.partQuestionAnswers,
                         moldingQuestionAnswers: order.damage.moldingQuestionAnswers,
                         capabilityQuestionAnswers: order.damage.capabilityQuestionAnswers,
+                        installOemGlass: order.damage.installOemGlass,
                     },
                     lineItems: {
                         glassParts: lineItems.glassParts,
@@ -2546,7 +2548,6 @@ export const actions = {
                     lockToken: order.lockToken,
                     isRecalAckOptIn: order.isRecalAckOptIn,
                     isMSRFeeApplicable: order.isMSRFeeApplicable,
-                    isOemGlassSelected: order.isOemGlassSelected,
                     cashPriceSubTotal: order.cashPriceSubTotal,
                 },
             },