diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index 3858eb1ad..ac11f8c32 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -572,10 +572,10 @@ export default {
             return match ?? value;
         },
         getPolicyStateFromStore() {
-            return store.getters.order.customer.address.state;
+            return store.getters.order.damage.damageState;
         },
         getCityFromStore() {
-            return store.getters.order.customer.address.city;
+            return store.getters.order.damage.damageCity;
         },
         getDateOfBirthFromStore() {
             return store.getters.order.policy.dateOfBirth;
@@ -626,8 +626,8 @@ export default {
                     zipCode: this.policyZip,
                     phoneNumber: this.phoneNumber,
                     phoneExtension: this.phoneExtension,
-                    state: this.policyState,
-                    city: this.city,
+                    state: null,
+                    city: null,
                     morePolicyQuestions: this.morePolicyQuestions,
                     lossLocation: this.lossLocation,
                     lossTime: this.lossTime,
@@ -645,6 +645,8 @@ export default {
                 {
                     dateOfLoss: this.dateOfLoss,
                     damageCause: this.damageCause,
+                    damageState: this.policyState,
+                    damageCity: this.city,
                 },
                 false
             );
diff --git a/src/store/index.js b/src/store/index.js
index 90866c740..d6410b196 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -133,6 +133,8 @@ const getDefaultState = () => {
                 dateOfLoss: null,
                 damageCause: null,
                 installOemGlass: null,
+                damageCity: null,
+                damageState: null,
             },
             lineItems: {
                 glassParts: null,
@@ -618,6 +620,8 @@ export const mutations = {
         if (damageDetails) {
             state.order.damage.dateOfLoss = damageDetails.dateOfLoss;
             state.order.damage.damageCause = damageDetails.damageCause;
+            state.order.damage.damageState = damageDetails.damageState;
+            state.order.damage.damageCity = damageDetails.damageCity;
         }
     },
 
@@ -891,7 +895,8 @@ export const mutations = {
             sessionInformation.order.damage?.dateOfLoss
         );
         state.order.damage.damageCause = sessionInformation.order.damage?.damageCause;
-
+        state.order.damage.damageState = sessionInformation.order.damage?.damageState;
+        state.order.damage.damageCity = sessionInformation.order.damage?.damageCity;
         state.order.damage.partQuestionAnswers =
             sessionInformation.order.damage.partQuestionAnswers;
         state.order.damage.moldingQuestionAnswers =
@@ -2852,6 +2857,8 @@ export const actions = {
                         installOemGlass: order.damage.installOemGlass,
                         dateOfLoss: order.damage.dateOfLoss,
                         damageCause: order.damage.damageCause,
+                        damageState: order.damage.damageState,
+                        damageCity: order.damage.damageCity,
                     },
                     lineItems: {
                         glassParts: lineItems.glassParts,