diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index c64300259..70a4dbc01 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1171,7 +1171,7 @@ export default {
                     (this.isServiceableInshop && !selectedDateInshop) ||
                     (this.isServiceableDropoff && !selectedDateInshop)
                 ) {
-                    setTimeout(() => {
+                    this.$nextTick(() => {
                         this.$refs.datePicker.showAnotherMonth().then((moreSelectableDates) => {
                             // update all dates
                             this.selectableDatesInshop.days =
@@ -1180,7 +1180,7 @@ export default {
                                 moreSelectableDates.mobileTimeSlotsData.days;
                             this.setDisplayWaitList();
                         });
-                    }, 50);
+                    });
                 }
                 if (this.isMobileSelected) {
                     this.selectedDate = selectedDateMobile;
@@ -1599,17 +1599,13 @@ export default {
         },
         updateSelectedProviderAndZipCode(newZipCode, newProvider) {
             this.resetMobileLocation();
-
-            getShopProviderData(newZipCode.zipCode).then((result) => {
-                this.shopProviderData = result.data;
-                this.state = newZipCode.state;
-                this.zipCode = newZipCode.zipCode;
-                this.zipCodeCtu = newZipCode.zipCodeCtu;
-                this.zipContainsMilitaryBase = newZipCode.containsMilitaryBase;
-                this.selectedDate = null;
-                this.selectedProvider = newProvider;
-                this.initializeDatePicker();
-            });
+            this.state = newZipCode.state;
+            this.zipCode = newZipCode.zipCode;
+            this.zipCodeCtu = newZipCode.zipCodeCtu;
+            this.zipContainsMilitaryBase = newZipCode.containsMilitaryBase;
+            this.selectedDate = null;
+            this.selectedProvider = newProvider;
+            this.initializeDatePicker();
         },
         handleAppointmentTypeChange(newAppointmentType) {
             this.updateFooterButtonText();