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 2a9ebaa00..36f80dd1c 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
@@ -136,7 +136,7 @@ export default {
         },
         addressModel: {
             get: function () {
-                return this.mobileLocationQuestionsModel.addressQuestions;
+                return this.mobileLocationQuestionsInput.addressQuestions;
             },
         },
         _isVehicleProtected: {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index a1023f9e9..26fba5a20 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -100,11 +100,11 @@ export default {
                 };
             },
             set: function (newValue) {
-                this.streetAddress = newValue.streetAddress;
-                this.apartmentNumberOrBusinessName = newValue.apartmentNumberOrBusinessName;
-                this.city = newValue.city;
-                this.state = newValue.state;
-                this.zipCode = newValue.zipCode;
+                this.streetAddress = newValue.addressQuestions.streetAddress;
+                this.apartmentNumberOrBusinessName = newValue.addressQuestions.apartmentNumberOrBusinessName;
+                this.city = newValue.addressQuestions.city;
+                this.state = newValue.addressQuestions.state;
+                this.zipCode = newValue.addressQuestions.zipCode;
             },
         },
     },