diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index e58dc0a3a..6da22c37c 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -129,11 +129,6 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo
         heritageParms["forceEndToEndInsurance"] = true;
     }
 
-    // if they are going to heritage and already have a policy number then this is a nav back flow
-    if (store.getters.policy.policyNumber) {
-        heritageParms["insuranceNavBack"] = true;
-    }
-
     router.navigateToExternalUrl(externalUrls.HERITAGE_FUNNEL, heritageParms);
 }
 
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 76fd20c5d..89b3320fd 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -458,6 +458,12 @@ export default {
         },
         updateAndSaveSupportingItems() {
             const supportingItems = store.getters.lineItems.supportingItems;
+
+            // for insurance orders, fees can get removed causing supportingitems to be null or empty
+            if (!supportingItems) {
+                return;
+            }
+
             // if we have a mobile fee, then save/update supporting items
             if (this.selectedAppointmentType == "Mobile") {
                 const mobileFeeIndex = supportingItems.findIndex(