diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 1f0930477..31ba38d35 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -14,7 +14,7 @@ import { storeMutations } from "@/constants/store-mutations";
     it will reset the state and go back to the start of the funnel.
 
 */
-export async function loadSessionIfPresent() {
+export async function loadSessionIfPresent(isConceptInsurance) {
     const funnelCookie = getFunnelCookie();
 
     // Do nothing if there is no cookie or session to use for loading.
@@ -35,7 +35,8 @@ export async function loadSessionIfPresent() {
             funnelCookie.SavedSessionId,
             funnelCookie.ReferralNumber,
             funnelCookie.ReferralParentAccountNumber,
-            funnelCookie.ReferralCorrelationId
+            funnelCookie.ReferralCorrelationId,
+            isConceptInsurance
         )
     ).data;
 }
@@ -68,9 +69,16 @@ export async function saveSession() {
     Calls API to load session given the referral number, referralDate, and referralCorrelationId
     and returns the response.
 */
-async function loadSession(savedSessionId, referralNumber, accountNumber, referralCorrelationId) {
+async function loadSession(
+    savedSessionId,
+    referralNumber,
+    accountNumber,
+    referralCorrelationId,
+    isConceptInsurance
+) {
     // await the saveSessionPromise in the store to make sure we're loading up to date information
     await store.getters.applicationUser.saveSessionPromise;
+
     const response = await baseMixin.methods.dispatchStoreAction(
         storeActions.LOAD_SESSION,
         {
@@ -78,6 +86,7 @@ async function loadSession(savedSessionId, referralNumber, accountNumber, referr
             referralNumber,
             accountNumber,
             referralCorrelationId,
+            isConceptInsurance,
         },
         false
     );
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 770c8443f..76ea36869 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -149,10 +149,7 @@ export default {
 
             const glassPartsForStore = partsLookup.data.glassPieceParts;
 
-            // this.navigateForward(glassPartsForStore);
-
-            // TODO KO delete for quote mvp
-            this.navigateForward(glassPartsForStore, null, this.shouldGoToHeritageQuote);
+            this.navigateForward(glassPartsForStore);
         },
     },
     components: {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 3a1ba2cf8..5eababde5 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -148,8 +148,13 @@ export default {
             );
         },
         getDefaultIsInsuranceSelectedValue(availableLineItems) {
+            // Override if coming back from QuoteDetails. Remove override after Quote release
+            const isInsuranceOverrideValue = this.$route.query?.isInsurance;
+
             const defaultIsInsuranceSelectedValue = this.$store.getters.order.payment.isInsurance;
-            if (defaultIsInsuranceSelectedValue != null) {
+            if (isInsuranceOverrideValue != null) {
+                return isInsuranceOverrideValue == "true";
+            } else if (defaultIsInsuranceSelectedValue != null) {
                 return defaultIsInsuranceSelectedValue;
             } else {
                 return availableLineItems
diff --git a/src/router/index.js b/src/router/index.js
index 67961ece2..324cba3c7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -67,7 +67,15 @@ const routes = [
                     //   the saveSessionPromise will no longer point to a valid promise
                     baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
 
-                    const loadSessionResponse = await loadSessionIfPresent();
+                    // Remove the parameter after quote release
+                    const loadSessionResponse = await loadSessionIfPresent(
+                        to.query.isInsurance != null
+                            ? to.query.isInsurance == "true"
+                                ? true
+                                : false
+                            : null
+                    );
+
                     const pageToRedirectTo = await getPageToRouteExistingOrderTo(
                         to,
                         loadSessionResponse
diff --git a/src/store/index.js b/src/store/index.js
index ef187366b..a998f5523 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1039,7 +1039,10 @@ export const actions = {
             },
         });
     },
-    loadSession(context, { savedSessionId, referralNumber, referralCorrelationId, accountNumber }) {
+    loadSession(
+        context,
+        { savedSessionId, referralNumber, referralCorrelationId, accountNumber, isConceptInsurance }
+    ) {
         const order = context.state.order;
 
         return globalMethods