diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 21585b247..30ae38058 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -125,8 +125,10 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo
     }
 
     if (
-        process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglassdev") &&
-        process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost"
+        (process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglassdev") &&
+            process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") ||
+        (process.env.VUE_APP_HERITAGE_FUNNEL.includes("localhost") &&
+            process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost")
     ) {
         heritageParms["forceEndToEndInsurance"] = true;
     }
diff --git a/src/router/index.js b/src/router/index.js
index f9dcd3142..d329c358a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -649,7 +649,7 @@ function updateExternalParameterState() {
             externalParameterServicePackage?.toLowerCase()
         );
     }
-    if (externalParameterDamage.toUpperCase() != "WINDSHIELDREPAIR") {
+    if (externalParameterDamage?.toUpperCase() != "WINDSHIELDREPAIR") {
         store.commit(
             storeMutations.UPDATE_EXTERNAL_PARAMETER_VIN_SELECTION,
             externalParameterVinSelection