diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 724f3f856..42ea1b578 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -425,7 +425,6 @@ export default {
             shopProviderData: null,
             navigatingForward: false,
             shopListButton: shopListButton,
-            lastInshopProvider: this.getSelectedProviderFromStore() || null,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1117,13 +1116,6 @@ export default {
             } else {
                 this.updateSelectedProvider(selectedProvider);
             }
-            if (
-                this.appointmentType === this.appointmentTypeStrings.IN_SHOP ||
-                this.appointmentType === this.appointmentTypeStrings.DROP_OFF ||
-                this.appointmentType === this.appointmentTypeStrings.IN_SHOP_OR_DROP_OFF
-            ) {
-                this.lastInshopProvider = this.selectedProvider;
-            }
         },
         async getMoreScheduleData(startDate, endDate) {
             // called only when "View more dates" is clicked; not on initial page load
@@ -1616,13 +1608,9 @@ export default {
                     },
                 };
             } else if (
-                (this.appointmentType === this.appointmentTypeStrings.IN_SHOP ||
-                    this.appointmentType === this.appointmentTypeStrings.DROP_OFF ||
-                    this.appointmentType === this.appointmentTypeStrings.IN_SHOP_OR_DROP_OFF) &&
-                this.lastInshopProvider.address.city
+                !this.selectedProvider?.address?.streetAddress &&
+                this.shopProviderData?.shopProviders?.length
             ) {
-                this.selectedProvider = this.lastInshopProvider;
-            } else {
                 this.selectedProvider = this.shopProviderData.shopProviders[0];
             }
         },