diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js
index 60f07770..8e1dc817 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js
@@ -5,9 +5,9 @@ import store from './_store';
 Vue.use(VueRouter);
 
 const guard = (to, from, next) => {
-    if (store.getters.isLoading) {
+    if (store.state.loading) {
         next(false);
-    } else if (store.getters.isLoggedIn) {
+    } else if (store.state.loggedIn) {
         next();
     } else {
         next({ name: 'login' });
@@ -26,7 +26,7 @@ export default new VueRouter({
             path: '/',
             component: Login,
             beforeEnter (from, to, next) {
-                if (!store.getters.isLoggedIn) {
+                if (!store.state.loggedIn) {
                     next();
                 } else {
                     next({ name: 'address' });
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js
index 6a73cb4f..d0e3baac 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js
@@ -152,12 +152,6 @@ export default new Vuex.Store({
         }
     },
     getters: {
-        isLoading: state => {
-            return state.loading;
-        },
-        isLoggedIn: state => {
-            return state.loggedIn;
-        },
         authToken () {
             return sessionStorage.getItem('token')
         }
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Address.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Address.vue
index 912f5490..942e6e20 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Address.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Address.vue
@@ -150,7 +150,7 @@
                 return this.$store.state.countries;
             },
             loading () {
-	            return this.$store.getters.isLoading;
+	            return this.$store.state.loading;
             }
         }
     }
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue
index 95735f9b..b2d5eb19 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue
@@ -39,13 +39,13 @@
         },
         computed: {
             isLoggedIn () {
-                return this.$store.getters.isLoggedIn;
+                return this.$store.state.loggedIn;
             },
             loaderUrl () {
                 return this.$store.state.config.loaderUrl;
             },
             loading () {
-                return this.$store.getters.isLoading;
+                return this.$store.state.loading;
             }
         },
         created () {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/CrmData.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/CrmData.vue
index 5499563c..eeafd36e 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/CrmData.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/CrmData.vue
@@ -83,7 +83,7 @@
                 return this.$store.state.config.loaderUrl;
             },
             loading () {
-                return this.$store.getters.isLoading;
+                return this.$store.state.loading;
             }
         }
     }
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Events.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Events.vue
index 266c309b..30e8a024 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Events.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Events.vue
@@ -93,7 +93,7 @@
                 return this.$store.state.config.loaderUrl;
             },
             loading () {
-                return this.$store.getters.isLoading;
+                return this.$store.state.loading;
             }
         }
     }
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Login.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Login.vue
index 652b9887..4137046b 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Login.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Login.vue
@@ -60,7 +60,7 @@
                 return this.$store.state.config.loaderUrl;
             },
             loading () {
-                return this.$store.getters.isLoading;
+                return this.$store.state.loading;
             }
         }
     }