diff --git a/src/layouts/quote/oem-glass-question/oem-glass-question.vue b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
index 1fc251b4c..b591587c6 100644
--- a/src/layouts/quote/oem-glass-question/oem-glass-question.vue
+++ b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
@@ -11,8 +11,7 @@
                 <checkboxQuestion
                     class="mt-3"
                     cmsWidgetName="OemGlassInputQuestionWidget"
-                    v-model="installOemGlass"
-                    @click="waitListChecked" />
+                    v-model="installOemGlass" />
             </div>
         </div>
     </div>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 8d86c16af..096620d65 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -332,9 +332,12 @@ export default {
         const nullSafeGlassParts = lineItems.glassParts ?? [];
 
         const oemGlassCheck = resultMap.oemGlassCheck;
-        const offerOem = experimentAllowsOfferOem ? oemGlassCheck.offerOem : false;
+        const offerOem = experimentAllowsOfferOem ? oemGlassCheck?.offerOem : false;
         const oemGlassPieceParts = oemGlassCheck?.glassPieceParts;
-        const oemGlassParts = oemGlassPieceParts ? oemGlassPieceParts[0].parts : null;
+        const oemGlassParts =
+            oemGlassPieceParts && oemGlassPieceParts.length > 0
+                ? oemGlassPieceParts[0].parts
+                : null;
         const isOemGlassSelected = store.getters.order.isOemGlassSelected;
 
         let alternateGlassPartsForOem;
@@ -764,7 +767,11 @@ export default {
                 this.lineItems.supportingItems = this.filterOutFees(this.lineItems.supportingItems);
             }
 
-            if (this.alternateGlassPartsForOem && this.alternateGlassPartsForOem.length > 0) {
+            if (
+                this.lineItems.glassParts &&
+                this.alternateGlassPartsForOem &&
+                this.alternateGlassPartsForOem.length > 0
+            ) {
                 let isOEMGlassOnOrder = this.isOEMGlassOnOrder(this.lineItems.glassParts);
                 if (
                     (this.isOemGlassSelected && !isOEMGlassOnOrder) ||