diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 4931b9c61..9c2ce4caf 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -258,8 +258,13 @@ export default {
                 this.displayNonServiceableZipAlert = false;
 
                 const payment = this.$store.getters.payment;
+                const policy = this.$store.getters.policy;
+
                 const vehicleChangedDuringPolicyLookupInHeritage =
-                    payment.isInsurance && payment.insuranceCoverage.coverageStatus;
+                    payment.isInsurance &&
+                    payment.insuranceCoverage.coverageStatus &&
+                    policy.policyNumber !== "";
+
                 if (vehicleChangedDuringPolicyLookupInHeritage) {
                     navigateToHeritageFunnel({
                         shouldSaveSession: true,
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 866567101..95ef0afda 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -367,11 +367,14 @@ export default {
 
         navigateForward() {
             const payment = this.$store.getters.payment;
+            const policy = this.$store.getters.policy;
 
             const vehicleChangedDuringPolicyLookupInHeritage =
                 payment.isInsurance &&
                 payment.insuranceCoverage.coverageStatus &&
-                payment.insuranceCoverage.coverageStatus !== "";
+                payment.insuranceCoverage.coverageStatus !== "" &&
+                policy.policyNumber !== "";
+
             if (vehicleChangedDuringPolicyLookupInHeritage) {
                 if (store.getters.damage.isRepair) {
                     this.$router.navigateWithSaving(