diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index bede93c4e..675b54e2e 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -119,6 +119,7 @@
                         @update:modelValue="onShopModelUpdated"
                         @updated-zipcode-ctu="setZipcodeCtu"
                         @update-shop-provider-data="shopProviderData = $event"
+                        @updated-contains-military-base="setContainsMilitaryBase"
                         :zipCode="zipCode"
                         :isDisplayed="isShopQuestionDisplayed"
                         cmsWidgetName="YourSafeliteShopWidget" />
@@ -1607,35 +1608,15 @@ export default {
         appointmentType: {
             handler(newValue, oldValue) {
                 if (newValue === AppointmentTypeStrings.MOBILE) {
-                    const providerExists = this.shopProviderData.shopProviders.some(
-                        (p) => p.providerNumber === this.selectedProvider?.providerNumber
-                    );
-                    if (providerExists) {
-                        this.lastInshopProvider = this.selectedProvider;
-                    }
                     this.selectedProvider = new Provider(
                         this.shopProviderData.mobileProviderNumber
                     );
                     this.isMobileSelected = true;
-                } else if (
-                    newValue === AppointmentTypeStrings.DROP_OFF ||
-                    newValue === AppointmentTypeStrings.IN_SHOP ||
-                    newValue === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF
-                ) {
-                    const providerExists = this.shopProviderData.shopProviders.some(
-                        (p) => p.providerNumber === this.selectedProvider?.providerNumber
-                    );
-                    if (providerExists) {
-                        this.selectedProvider = this.lastInshopProvider;
-                    } else {
-                        this.selectedProvider = this.shopProviderData.shopProviders[0];
-                    }
                 } else {
                     this.selectedProvider = this.shopProviderData.shopProviders[0];
                 }
             },
         },
-
         appointmentTypeFromAppointmentTypeQuestion: {
             handler(newValue, oldValue) {
                 if (newValue === AppointmentTypeStrings.MOBILE) {