diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.spec.js b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.spec.js
index 43f69c74..a95f0c89 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.spec.js
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.spec.js
@@ -83,7 +83,7 @@ describe("glass-part-question.vue", () => {
                 },
             ],
         };
-
+        
         const { wrapper } = setupMocks(featureListData);
         
         //Act
@@ -94,7 +94,7 @@ describe("glass-part-question.vue", () => {
         await wrapper.setData({ selectedTint: "Green Tint" });
         // to trigger the computed setter
         wrapper.vm.selectedPartNumber = "DB12209GTYN";
-
+        
         //Assert
         expect(wrapper.emitted()["update:modelValue"][0]).toEqual([
             { partNumber: "DB12209GTYN", color: "Green Tint" },
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 2117390e..3a622b2c 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
@@ -118,7 +118,7 @@ export default {
                 return this.modelValue?.partNumber;
             },
             set(newValue) {
-                const part = !newValue ? null : this.partsForSelectedTint.filter((part) => part.partNumber == newValue.value)[0]
+                const part = this.partsForSelectedTint.filter((part) => part.partNumber == newValue?.value)[0];
                 this.$emit("update:modelValue", part);
             },
         },