diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 5672c05e6..c1dd44145 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -327,10 +327,15 @@ export default {
 
             const payment = this.$store.getters.payment;
             if (payment.isInsurance) {
-                this.$router.navigateWithSaving(
-                    this.navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
-                    this.$route
-                );
+                navigateToHeritageFunnel({
+                    shouldSaveSession: true,
+                    pageNameToLog: "quote",
+                    loadingModal: this.$refs.loadingModal,
+                });
+                // this.$router.navigateWithSaving(
+                //     this.navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
+                //     this.$route
+                // );
             } else {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_CASH,
diff --git a/src/store/index.js b/src/store/index.js
index 5114bc95c..4db6b9fc2 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -84,6 +84,8 @@ const getDefaultState = () => {
                 partQuestionAnswers: null,
                 moldingQuestionAnswers: null,
                 capabilityQuestionAnswers: null,
+                dateOfLoss: null,
+                damageCause: null,
             },
             lineItems: {
                 glassParts: null,
@@ -123,8 +125,6 @@ const getDefaultState = () => {
             policy: {
                 currentDeductible: 0,
                 policyNumber: null,
-                dateOfLoss: null,
-                lossCause: null,
                 isItac: false,
                 additionalAuthFlag: null,
                 isNoComp: false,
@@ -514,6 +514,8 @@ export const mutations = {
         state.order.damage.glassToReplace = sessionInformation.order.damage.glassToReplace;
         state.order.damage.isRepair = sessionInformation.order.damage.isRepair;
         state.order.damage.numberOfChips = sessionInformation.order.damage.numberOfChips;
+        state.order.damage.dateOfLoss = sessionInformation.order.damage?.lossDate;
+        state.order.damage.damageCause = sessionInformation.order.damage?.damageCause;
 
         state.order.damage.partQuestionAnswers =
             sessionInformation.order.damage.partQuestionAnswers;
@@ -599,8 +601,6 @@ export const mutations = {
         state.order.policy.additionalAuthFlag = sessionInformation.order.policy?.additionalAuthFlag;
         state.order.policy.isItac = sessionInformation.order.policy?.isItac;
         state.order.policy.policyNumber = sessionInformation.order.policy?.policyNumber;
-        state.order.policy.dateOfLoss = sessionInformation.order.policy?.lossDate;
-        state.order.policy.lossCause = sessionInformation.order.policy?.lossCause;
         state.order.policy.insuranceCompanyName =
             sessionInformation.order.policy?.insuranceCompanyName;
         state.order.policy.isNoComp = sessionInformation.order.policy?.noComprehensive;