diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index a79b2b1f5..4af1974eb 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -22,7 +22,7 @@
                         @updated-serviceability="setServiceabilityDetails"
                         @updated-contains-military-base="setContainsMilitaryBase"
                         @updated-bill-to-account-number="setBillToAccountNumber"
-                        @reset-waitlist="resetWaitlist"
+                        @service-zip-changed-from-modal="onServiceZipChanged"
                         linkWidgetName="ServiceZipLinkWidget"
                         modalWidgetName="ServiceZipModalWidget" />
                     <alert
@@ -987,6 +987,13 @@ export default {
             this.dispatchStoreAction(this.storeActions.SAVE_WAITLIST_REQUESTED, false, false);
             this.waitListRequested = false;
         },
+        onServiceZipChanged() {
+            this.resetWaitlist();
+            this.appointmentType = null;
+            this.selectedProvider = null;
+            this.appointmentTypeFromAppointmentTypeQuestion = null;
+            this.preSelectedDate = null;
+        },
         setServiceabilityDetails(serviceabilityDetails) {
             this.isGlassServiceableInshop = serviceabilityDetails.isGlassServiceableInshop;
             this.isRecalibrationServiceableInshop =
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 74a0fdf77..b7df9969a 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -219,7 +219,7 @@ export default {
                     this.$emit("updated-serviceability", serviceabilityDetails.data);
                     this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
                     this.$emit("updated-bill-to-account-number", billToAccountNumber);
-                    this.$emit("reset-waitlist");
+                    this.$emit("service-zip-changed-from-modal");
                     // update the page level model
                     this.$emit("update:modelValue", this.internalModel);