diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index b4da4ddfa..586e1c6de 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -64,7 +64,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 
 export default {
     name: "mobile-location-modal-questions",
-    emits: ["update:modelValue", "set-mobile-fee-part"],
+    emits: ["update:modelValue", "updated-mobile-fee-part"],
     data() {
         return {
             internalModel: deepClone(this.modelValue),
@@ -89,8 +89,6 @@ export default {
             type: Object,
             default: () => ({}),
         },
-        isZipServiceableMobile: Boolean,
-        isZipServiceableInShop: Boolean,
         linkWidgetName: String,
         modalWidgetName: String,
         alertNonServiceableZipWidgetName: String,
@@ -109,7 +107,8 @@ export default {
                 this.addressModel.state &&
                 this.addressModel.state !== "" &&
                 this.addressModel.zipCode &&
-                this.addressModel.zipCode !== ""
+                this.addressModel.zipCode !== "" &&
+                this.internalModel.isVehicleProtected !== null
             ) {
                 return `${this.addressModel.streetAddress}\n${this.addressModel.city}, ${this.addressModel.state} ${this.addressModel.zipCode}`;
             }
@@ -184,7 +183,7 @@ export default {
                 const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
 
                 // emit it to parent
-                this.$emit("set-mobile-fee-part", mobileFeePart);
+                this.$emit("updated-mobile-fee-part", mobileFeePart);
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e458b112b..58f440708 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -8,7 +8,7 @@
                 v-model="serviceZipCodeQuestion"
                 ref="serviceZipCodeQuestion"
                 :mobileFeePart="mobileFeePart"
-                @set-mobile-fee-part="setMobileFeePart"
+                @updated-mobile-fee-part="setMobileFeePart"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
             <alert
@@ -19,7 +19,7 @@
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
                 :mobileFeePart="mobileFeePart"
-                @set-mobile-fee-part="setMobileFeePart"
+                @updated-mobile-fee-part="setMobileFeePart"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
@@ -72,16 +72,8 @@ export default {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
-        const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
-        const parentAccountNumber = store.getters.payment.parentAccountNumber;
-        const billToAccountNumber = 1;
 
-        const mobileFeePartPromise = getPricedMobileFeePart(
-            serviceZipCode,
-            serviceType,
-            parentAccountNumber,
-            billToAccountNumber
-        );
+        const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 2c1e0e588..0d2c35000 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -43,7 +43,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 
 export default {
     name: "service-zip-modal-question",
-    emits: ["update:modelValue", "set-mobile-fee-part"],
+    emits: ["update:modelValue", "updated-mobile-fee-part"],
     data() {
         return {
             internalModel: this.copyModel(this.modelValue),
@@ -156,7 +156,7 @@ export default {
                 const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
 
                 // emit it to parent
-                this.$emit("set-mobile-fee-part", mobileFeePart);
+                this.$emit("updated-mobile-fee-part", mobileFeePart);
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);