diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index 9b517c88..48f8039c 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -204,13 +204,16 @@ export default {
                 // Populate button-question model-value if parts data already exists in store
                 if (this.modelValue !== undefined) {
                     this.selectedTint = this.modelValue.color;
-                    for (const tintPart of this.partsForSelectedTint) {
-                        for (const glassPart of useMainStore().order.lineItems.glassParts) {
-                            if (tintPart.partNumber === glassPart.partNumber) {
-                                this.$nextTick(() => {
-                                    this.updateSelectedPartNumber(tintPart.partNumber);
-                                });
-                                return;
+                    const { glassParts } = useMainStore().order.lineItems;
+                    if (glassParts) {
+                        for (const tintPart of this.partsForSelectedTint) {
+                            for (const glassPart of glassParts) {
+                                if (tintPart.partNumber === glassPart.partNumber) {
+                                    this.$nextTick(() => {
+                                        this.updateSelectedPartNumber(tintPart.partNumber);
+                                    });
+                                    return;
+                                }
                             }
                         }
                     }