diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index 247fce2e9..0e47eb37f 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -122,37 +122,6 @@ describe("vehicle-damage.vue", () => {
   });
 });
 
-
-
-describe("vehicle-damage.vue", () => {
-  test("Windshield Options ares initailized with api data", async (done) => {
-    //Arrange
-    const pageHeaderWidgetHeaderText = "Select Damage";
-    const { wrapper, apiPromise } = setupMocks({
-      pageHeaderWidgetHeaderText: pageHeaderWidgetHeaderText,
-    });
-
-    //Act
-    vehicleDamage.beforeRouteEnter.call(
-      wrapper.vm,
-      { query: { fmgPage: "vehicle-damage" } },
-      undefined,
-      (c) => c(wrapper.vm)
-    );
-
-    //Assert
-    apiPromise.finally(() => {
-      expect(funnelSubHeader.methods.initializeComponent).toHaveBeenCalledWith(
-        pageHeaderWidgetHeaderText
-      );
-      done();
-    });
-  });
-});
-
-
-
-
 describe("vehicle-damage.vue", () => {
   test("CarId set, arePagePrerequisitesValid should be true ", async () => {
     //Arrange
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index c917031aa..8f57f61b7 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -79,6 +79,8 @@ export default ({
                 return this.selectedValues.selectedWindshieldDamageType;
             },
             set: function(newValue) {
+                this.selectedValues.selectedWindshieldChipCount = null;
+                this.selectedValues.selectedWindshieldReplaceOptions = null;
                 this.selectedValues = this.getWindshieldOptions(newValue, this.selectedWindshieldChipCountValues, this.selectedWindshieldReplaceOptionsValues);
             }
         },
@@ -87,6 +89,7 @@ export default ({
                 return this.selectedValues.selectedChipCount;
             },
             set: function(newValue) {
+                this.selectedValues.selectedWindshieldReplaceOptions = null;
                 this.selectedValues = this.getWindshieldOptions(this.selectedWindshieldDamageTypeValues, newValue, this.selectedWindshieldReplaceOptionsValues);
             }
         },
@@ -95,6 +98,7 @@ export default ({
                 return this.selectedValues.selectedWindshieldReplaceOptions;
             },
             set: function(newValue) {
+                this.selectedValues.selectedWindshieldChipCount = null;
                 this.selectedValues = this.getWindshieldOptions(this.selectedWindshieldDamageTypeValues, this.selectedWindshieldChipCountValues, newValue);
             }
         },