diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index 817aa7b7e..82be61557 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -1,9 +1,13 @@
 import { storeActions } from "@/constants/store-actions.js";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
+import { saveOrder } from "@/helpers/heritage-integration/order-helper.js";
 
 export default {
     methods: {
         async navigateForwardWithSingleCarMatch() {
+            // We want to save the order before calling getPartsOrQuestions because that call is lengthy
+            saveOrder(); 
+
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);
             const partsOrQuestions = result.data.partsOrQuestions;
 
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index e95fea92f..a4b2b136e 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -9,6 +9,10 @@ jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
     navigateForward: jest.fn()
 }));
 
+jest.mock("@/helpers/heritage-integration/order-helper.js", () => ({
+    saveOrder: jest.fn()
+}));
+
 describe("vin-pages-mixin", () => {
     afterEach(() => {
         jest.clearAllMocks();
@@ -19,7 +23,7 @@ describe("vin-pages-mixin", () => {
             // Arrange
             const { wrapper } = setupMocks({});
             vehicleQuestionsMixin.methods.navigateForward = jest.fn();
-
+            
             // Act
             await wrapper.vm.navigateForwardWithSingleCarMatch();