diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index aeb80bb35..9387bd89a 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -219,10 +219,9 @@ export default {
                     payment.isInsurance && payment.insuranceCoverage.coverageStatus;
                 if (vehicleChangedDuringPolicyLookupInHeritage) {
                     navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
-                } else if (this.$store.getters.order.referralNumber.length === 6) {
+                } else if (this.$store.getters.order.referralNumber?.length === 6) {
                     await this.navigateForwardWithSingleCarMatch();
-                }
-                else if (this.isRepair) {
+                } else if (this.isRepair) {
                     return this.$router.navigateWithSaving(
                         this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
                         this.$route
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index a390309b3..3a8fd4657 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -448,8 +448,7 @@ export default {
 
                 if (store.getters.order.referralNumber?.length === 6) {
                     navigateToHeritageFunnel({ loadingModal: self.$refs.loadingModal });
-                }
-                else if (payment.isInsurance && payment.insuranceCoverage.isVerified) {
+                } else if (payment.isInsurance && payment.insuranceCoverage.isVerified) {
                     navigateToHeritageFunnel({ loadingModal: self.$refs.loadingModal });
                 } else {
                     self.$router.navigateWithSaving(