diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 1a71f9dbd..72f9cbff4 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -80,10 +80,9 @@
                         labelBold="true" />
                 </div>
             </div>
-            <div class="row justify-content-center your-shop-location">
+            <div class="row justify-content-center your-shop-location" v-if="appointmentType && appointmentType !== appointmentTypeStrings.MOBILE">
                 <div class="col-md-6 col-xl-4">
                     <button-question
-                        v-if="appointmentType == appointmentTypeStrings.IN_SHOP"
                         class="shop-question-button"
                         ref="buttonQuestion"
                         :answers="selectedShopAnswer"
@@ -753,7 +752,7 @@ export default {
             }
         },
         isShopQuestionDisplayed() {
-            return this.appointmentType === "Inshop" || this.appointmentType === "Dropoff";
+            return this.appointmentType === AppointmentTypeStrings.IN_SHOP || this.appointmentType === AppointmentTypeStrings.DROP_OFF || AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
         },
         isAppointmentTypeDisplayed() {
             // temporary adjustment
diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue
index bcf8281b3..629ba9574 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -134,7 +134,7 @@ export default {
         };
     },
     props: {
-        selectedAppointmentType: String,
+        appointmentType: String,
         shopProviderData: Object,
         modelValue: {
             type: Object,
@@ -201,7 +201,7 @@ export default {
                 availabilityRatingCallback: getAvailabilityRating,
                 startDate: formattedStartDate,
                 endDate: formattedEndDate,
-                shopAppointmentType: this.selectedAppointmentType,
+                shopAppointmentType: this.appointmentType,
             };
         },
         showMoreShopsLinkText() {
@@ -271,8 +271,9 @@ export default {
                 gaAction = this.GaActions.SHOPS_FIRST_DISPLAYED;
             }
             if (
-                this.selectedAppointmentType === AppointmentTypeStrings.IN_SHOP ||
-                this.selectedAppointmentType === AppointmentTypeStrings.DROP_OFF
+                this.appointmentType === AppointmentTypeStrings.IN_SHOP ||
+                this.appointmentType === AppointmentTypeStrings.DROP_OFF || 
+                this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF
             ) {
                 var shops = mappedData.map((shop) => {
                     if (shop.value.length > 5 && shop.value.startsWith("00")) {
@@ -405,7 +406,7 @@ export default {
                         }
                         this.localShopProviderData = result.data;
                         this.updateShopsForZip(this.internalModel.zipCode);
-                        if (this.selectedAppointmentType === "Mobile") {
+                        if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
                             this.selectedProvider = new Provider(
                                 this.shopProviderData.mobileProviderNumber
                             );
@@ -417,7 +418,7 @@ export default {
             }
         },
         async updateShopsForZip(zipCode) {
-            if (!this.selectedAppointmentType) {
+            if (!this.appointmentType) {
                 this.answers = [];
                 this.isLoadingShops = false;
                 return;
@@ -476,7 +477,7 @@ export default {
                         availabilityRatingCallback: getAvailabilityRating,
                         startDate: formattedStartDate,
                         endDate: formattedEndDate,
-                        shopAppointmentType: this.selectedAppointmentType,
+                        shopAppointmentType: this.appointmentType,
                     },
                     value: shopProvider.providerNumber,
                 };