diff --git a/src/router/index.js b/src/router/index.js
index a2efe1a7..de100b55 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -17,6 +17,7 @@ import applicationConfig from '@/constants/application-config';
 import analyticsMixin from '@/mixins/analytics-mixin';
 import navigationScenarios from './router-constants/navigation-scenarios';
 import { saveSession } from "@/helpers/order-helper.js";
+import routerParams from '@/router/router-constants/router-params';
 
 const routes = [
     {
@@ -93,9 +94,12 @@ router.afterEach(async (to, from) => {
         store.clearSaveSessionPromise();
     }
 
-    await saveSession({shouldAwaitSaveSessionQueue: true}).catch((error) => {
+    const saveSessionSynchronous = !!from.params[routerParams.SAVE_SESSION_SYNCHRONOUS];
+    await saveSession({shouldAwaitSaveSessionQueue: saveSessionSynchronous}).catch((error) => {
         if (from.name === issPageValues.WELCOME_PAGE) {
-            router.navigate(navigationScenarios.SAVE_SESSION_FAILED, {query: {issPage: issPageValues.WELCOME_PAGE}})
+            router.navigate(
+                navigationScenarios.SAVE_SESSION_FAILED,
+                {query: {issPage: issPageValues.WELCOME_PAGE}});
         }
     });
     
diff --git a/src/router/router-constants/router-params.js b/src/router/router-constants/router-params.js
index 37b1300d..2465f965 100644
--- a/src/router/router-constants/router-params.js
+++ b/src/router/router-constants/router-params.js
@@ -1,5 +1,6 @@
 const routerParams = Object.freeze({
-    DISPLAY_VEHICLE_CHANGE_ALERT: 'displayVehicleChangeAlert'
+    DISPLAY_VEHICLE_CHANGE_ALERT: 'displayVehicleChangeAlert',
+    SAVE_SESSION_SYNCHRONOUS: 'saveSessionSynchronous'
 });
 
 export default routerParams;