diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 2e4584c03..63ed541e5 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -65,16 +65,19 @@
                 ref="mobileLocationQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
-                <Transition name="fade" mode="out-in">
-            <shopQuestion
-                ref="shopQuestion"
-                v-show="selectedAppointmentType === 'Inshop' || selectedAppointmentType === 'Dropoff'"
-                v-model="providerNumber"
-                :isDropoff="isDropoff"
-                :serviceZipCode="zipCode"
-                :selectedAppointmentType="selectedAppointmentType"
-                :shopQuestionData="shopQuestionInitialData"
-                cmsWidgetName="ShopQuestionWidget" />
+            <Transition name="fade" mode="out-in">
+                <shopQuestion
+                    ref="shopQuestion"
+                    v-show="
+                        selectedAppointmentType === 'Inshop' ||
+                        selectedAppointmentType === 'Dropoff'
+                    "
+                    v-model="providerNumber"
+                    :isDropoff="isDropoff"
+                    :serviceZipCode="zipCode"
+                    :selectedAppointmentType="selectedAppointmentType"
+                    :shopQuestionData="shopQuestionInitialData"
+                    cmsWidgetName="ShopQuestionWidget" />
             </Transition>
             <contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" />
             <funnel-footer
@@ -146,6 +149,8 @@ export default {
             isRecalibrationServiceableInshop: null,
             isGlassServiceableMobile: null,
             isRecalibrationServiceableMobile: null,
+            selectedAppointmentType: "Dropoff",
+            providerNumber: "126",
             mobileFeePart: null,
             zipContainsMilitaryBase: false,
             shopQuestionInitialData: null,
diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue
index 33f734155..304651e81 100644
--- a/src/layouts/service-location/shop-question/shop-question.vue
+++ b/src/layouts/service-location/shop-question/shop-question.vue
@@ -152,8 +152,6 @@ export default {
         resetShopList() {
             this.answers = [];
             this.shopIndex = 0;
-
-            this.displaySeeMoreLocationsLink = true;
             this.selectedValue = "";
             this.$refs.buttonQuestion.resetField();
         },
@@ -177,6 +175,9 @@ export default {
                 this.$refs.buttonQuestion.resetField();
 
                 if (newValue != null) {
+                    this.resetShopList();
+                    this.getNextShopsFromList();
+
                     this.$nextTick().then(() => {
                         this.scrollToBottom();
                     });
@@ -186,7 +187,9 @@ export default {
         shops: {
             handler(newValue) {
                 this.$refs.buttonQuestion.resetField();
-                const selectedShopIndex = newValue.findIndex((provider) => provider.providerNumber == this.modelValue);
+                const selectedShopIndex = newValue.findIndex(
+                    (provider) => provider.providerNumber == this.modelValue
+                );
                 if (selectedShopIndex >= 3) {
                     this.getNextShopsFromList(selectedShopIndex + 1);
                 } else {