diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index b0a06b16f..28a8ca473 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -323,6 +323,30 @@ describe("service-location.vue", () => {
             expect(wrapper.vm.mobileLocationQuestions).toStrictEqual(newMobileLocationQuestions);
         });
 
+        test("resets appointment type selection when service zip code is updated by service zip modal", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.$refs.serviceZipCodeQuestion.resetMobileFeePart = jest.fn();
+
+            const newServiceZipCodeQuestion = {
+                zipCode: "61606",
+                state: "IL",
+            };
+
+            wrapper.vm.selectedAppointmentType = "Inshop";
+
+            const serviceZipCodeComponent = wrapper.findComponent({
+                ref: "serviceZipCodeQuestion",
+            });
+
+            // Act
+            serviceZipCodeComponent.vm.$emit("update:modelValue", newServiceZipCodeQuestion);
+
+            // Assert
+            expect(wrapper.vm.selectedAppointmentType).toStrictEqual(null);
+        });
+
         test("displays military zip message when zip is updated", () => {
             // Arrange
             const { wrapper } = setupMocks({});
@@ -437,6 +461,61 @@ describe("service-location.vue", () => {
             // Assert
             expect(wrapper.vm.serviceZipCodeQuestion).toStrictEqual(newServiceZipCodeInfo);
         });
+
+        test("resets appointment type selection when service zip code is updated by mobile location modal when Mobile is not selected", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.$refs.serviceZipCodeQuestion.resetMobileFeePart = jest.fn();
+
+            const newServiceZipCodeQuestion = {
+                zipCode: "61606",
+                state: "IL",
+            };
+
+            wrapper.vm.selectedAppointmentType = "Dropoff";
+
+            const serviceZipCodeComponent = wrapper.findComponent({
+                ref: "serviceZipCodeQuestion",
+            });
+
+            // Act
+            serviceZipCodeComponent.vm.$emit("update:modelValue", newServiceZipCodeQuestion);
+
+            // Assert
+            expect(wrapper.vm.selectedAppointmentType).toStrictEqual(null);
+        });
+
+        test("does not reset appointment type selection when service zip code is updated by mobile location modal when Mobile is selected", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            const appointmentTypeMobile = "Mobile";
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.$refs.serviceZipCodeQuestion.resetMobileFeePart = jest.fn();
+
+            const mobileLocationQuestions = {
+                addressQuestions: {
+                    streetAddress: "555 Some Street",
+                    apartmentNumberOrBusinessName: "",
+                    city: "Westerville",
+                    state: "OH",
+                    zipCode: "43081",
+                },
+                isVehicleProtected: "YesAnswer",
+            };
+
+            wrapper.vm.selectedAppointmentType = "Mobile";
+
+            const mobileLocationComponent = wrapper.findComponent({
+                ref: "mobileLocationModalQuestions",
+            });
+
+            // Act
+            mobileLocationComponent.vm.$emit("update:modelValue", mobileLocationQuestions);
+
+            // Assert
+            expect(wrapper.vm.selectedAppointmentType).toStrictEqual(appointmentTypeMobile);
+        });
     });
 
     describe("serviceability logic", () => {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 69b4f4926..ac1334fcb 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -169,6 +169,7 @@ export default {
             set: function (newValue) {
                 if (newValue.zipCode !== this.zipCode) {
                     this.resetMobileLocation();
+                    this.selectedAppointmentType = null;
                 }
 
                 this.state = newValue.state;
@@ -198,11 +199,15 @@ export default {
                 this.isVehicleProtected = newValue.isVehicleProtected;
 
                 this.mobileLocationValidationField = "isValid";
+
+                if (
+                    newValue.zipCode !== this.zipCode &&
+                    !this.selectedAppointmentType == "Mobile"
+                ) {
+                    this.selectedAppointmentType = null;
+                }
             },
         },
-        displayMilitaryZipAlert() {
-            return this.zipContainsMilitaryBase && this.isServiceableMobile;
-        },
         isServiceableMobile() {
             if (this.isRecalibrationServiceableMobile !== null) {
                 return this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
@@ -217,6 +222,9 @@ export default {
                 return this.isGlassServiceableInshop;
             }
         },
+        displayMilitaryZipAlert() {
+            return this.zipContainsMilitaryBase && this.isServiceableMobile;
+        },
         displayServiceableMobileOnly() {
             return this.isServiceableMobile && !this.isServiceableInshop;
         },
diff --git a/src/store/index.js b/src/store/index.js
index 2dbc7b2cc..6da7550a2 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -931,10 +931,10 @@ export const actions = {
         return globalMethods.callMockHttpClient({
             method: endpoints.GetServiceabilityDetails.method,
             //TODO: Remove Mocky Endpoints
-            endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
+            //endpoint: "https://run.mocky.io/v3/59e1a644-cf16-4f08-8069-1ab2a1e38f79", // NoShopsAvailable
             //endpoint: "https://run.mocky.io/v3/4fe1fb89-dd56-4e4a-9af2-96bd1ab77847", // ForcedInshop
             //endpoint: "https://run.mocky.io/v3/e2eaa097-6ea5-4906-af53-901edaa94939", // ForcedMobile
-            //endpoint: "https://run.mocky.io/v3/1811a1fe-12a7-48f3-939e-d10a9b77dd25", // All Options
+            endpoint: "https://run.mocky.io/v3/1811a1fe-12a7-48f3-939e-d10a9b77dd25", // All Options
         });
 
         // TODO: Restore this when CSR-1104 is 100% complete