diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 6fa248c63..0e756a8a4 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -28,7 +28,11 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita
 
     // If navigating to a specific page, and that page is not part of the vin pages.
     // Return that page, so that it can navigate like normal.
-    if (toRoute.query[queryStrings.FMG_PAGE] !== undefined && !isVinRelatedPage(toRoute)) {
+    if (
+        toRoute.query[queryStrings.FMG_PAGE] !== undefined &&
+        toRoute.query[queryStrings.FMG_PAGE] !== fmgPageValues.QUOTE &&
+        !isVinRelatedPage(toRoute)
+    ) {
         return overrideYmmsDirectionIfNeeded(toRoute);
     }
 
@@ -107,6 +111,7 @@ async function getLatestPageForRedirection() {
     const capabilityQuestionsComponent = await getLazyLoadedComponent(
         fmgPageValues.CAPABILITY_QUESTIONS
     );
+    const quoteComponent = await getLazyLoadedComponent(fmgPageValues.QUOTE);
 
     const skipVin = await skipVinLookup();
 
@@ -121,7 +126,9 @@ async function getLatestPageForRedirection() {
     } else if (!estimateComponent.methods.arePagePrerequisitesValid()) {
         return fmgPageValues.VEHICLE_DAMAGE;
     } else {
-        if (capabilityQuestionsComponent.methods.arePagePrerequisitesValid()) {
+        if (quoteComponent.methods.arePagePrerequisitesValid()) {
+            return fmgPageValues.QUOTE;
+        } else if (capabilityQuestionsComponent.methods.arePagePrerequisitesValid()) {
             return fmgPageValues.CAPABILITY_QUESTIONS;
         } else if (moldingQuestionsComponent.methods.arePagePrerequisitesValid()) {
             return fmgPageValues.MOLDING_QUESTIONS;