diff --git a/src/mixins/base-form-mixin.js b/src/mixins/base-form-mixin.js
index 9efb994c..f292c0ba 100644
--- a/src/mixins/base-form-mixin.js
+++ b/src/mixins/base-form-mixin.js
@@ -1,4 +1,9 @@
+import showIssLoadingModal from '@/helpers/loading-modal-helper';
+
 export default {
+    mounted() {
+        showIssLoadingModal(false);
+    },
     methods: {
         onSubmit() {
         /**
diff --git a/src/router/index.js b/src/router/index.js
index da2e85b0..96a905b9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -170,8 +170,6 @@ router.afterEach(async (to, from) => {
         store.clearSaveSessionPromise();
     }
 
-    showIssLoadingModal(false);
-
     const saveSessionSynchronous = !!from.params[routerParams.SAVE_SESSION_SYNCHRONOUS];
     await saveSession({ shouldAwaitSaveSessionQueue: saveSessionSynchronous }).catch((error) => {
         if (from.name === issPageValues.WELCOME_PAGE) {