diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index e882a2652..a670d7c5d 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1669,15 +1669,10 @@ export default {
             this.selectedProvider = new Provider();
             this.updateSelectedProvider();
         },
-        updateSelectedProvider(newProvider) {
-            if (newProvider) {
-                const didProviderNumberChange =
-                    this.selectedProvider.providerNumber !== newProvider.providerNumber;
-                this.selectedProvider = newProvider;
+        updateSelectedProvider(newShopProvider) {
 
-                if (didProviderNumberChange) {
-                    this.initializeDatePicker();
-                }
+            if (newShopProvider) {
+                this.selectedProvider = newShopProvider;
             } else if (this.appointmentType === this.appointmentTypeStrings.MOBILE) {
                 this.selectedProvider = {
                     providerNumber: this.shopProviderData.mobileProviderNumber.toString(),
@@ -1743,6 +1738,7 @@ export default {
                     this.lastSelectedInshopOrDropoffProvider = this.selectedProvider;
                 }
                 this.appointmentType = AppointmentTypeStrings.MOBILE;
+                this.updateSelectedProvider();
             } else if (newAppointmentType) {
                 if (this.appointmentType != AppointmentTypeStrings.MOBILE) {
                     // Clear last shop selected if appointment type was changed in any manner other than from Mobile
@@ -1756,6 +1752,8 @@ export default {
                 } else {
                     this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
                 }
+                // make sure a selectedProvider exists
+                this.updateSelectedProvider(this.lastSelectedInshopOrDropoffProvider);
             } else {
                 this.appointmentType = null;
             }