diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index e510959db..e61c72f7f 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -144,6 +144,12 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo
         heritageParms["forceEndToEndInsurance"] = true;
     }
 
+    // clear the heritage session that may still exist after an order was already submitted
+    if (window.sessionStorage.getItem("createNewSessionForHeritage") !== null) {
+        heritageParms["cns"] = "all";
+        window.sessionStorage.removeItem("createNewSessionForHeritage");
+    }
+
     router.navigateToExternalUrl(applicationConfig.HERITAGE_FUNNEL, heritageParms);
 }
 
diff --git a/src/store/index.js b/src/store/index.js
index b6c452909..ca10f8f62 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -822,8 +822,7 @@ export const getters = {
         var order;
         if (window.sessionStorage.getItem("submittedOrder") !== null) {
             order = JSON.parse(window.sessionStorage.getItem("submittedOrder"));
-        }
-        else {
+        } else {
             order = state.order;
         }
 
@@ -2955,6 +2954,7 @@ export const actions = {
 
         // set to local storage
         window.sessionStorage.setItem("submittedOrder", JSON.stringify(submittedOrder));
+        window.sessionStorage.setItem("createNewSessionForHeritage", true);
 
         // clear vuex
         context.commit(storeMutations.RESET_STATE);