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 31eb359b2..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),
@@ -107,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}`;
             }
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 6594061cd..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),