diff --git a/app/src/store/data.js b/app/src/store/data.js
index 59367225..a697bc3d 100644
--- a/app/src/store/data.js
+++ b/app/src/store/data.js
@@ -30,8 +30,9 @@ export default {
   }),
 
   mutations: {
-    'SET_DOMAINS' (state, [domains]) {
+    'SET_DOMAINS' (state, [{ domains, main }]) {
       state.domains = domains
+      state.main_domain = main
     },
 
     'SET_DOMAINS_DETAILS' (state, [name, details]) {
@@ -58,9 +59,10 @@ export default {
       state.domains.splice(state.domains.indexOf(domain), 1)
     },
 
-    'SET_MAIN_DOMAIN' (state, [response]) {
-      state.main_domain = response.current_main_domain
-    },
+    // Now applied thru 'SET_DOMAINS'
+    // 'SET_MAIN_DOMAIN' (state, [response]) {
+    //   state.main_domain = response.current_main_domain
+    // },
 
     'UPDATE_MAIN_DOMAIN' (state, [domain]) {
       state.main_domain = domain
@@ -145,7 +147,10 @@ export default {
       const ignoreCache = !rootState.cache || noCache || false
       if (currentState !== undefined && !ignoreCache) return currentState
       return api.fetch('GET', param ? `${uri}/${param}` : uri, null, humanKey, options).then(responseData => {
-        const data = responseData[storeKey] ? responseData[storeKey] : responseData
+        // FIXME here's an ugly fix to be able to also cache the main domain when querying domains
+        const data = storeKey === 'domains'
+          ? responseData
+          : responseData[storeKey] ? responseData[storeKey] : responseData
         commit(
           'SET_' + storeKey.toUpperCase(),
           [param, data, extraParams].filter(item => !isEmptyValue(item))
diff --git a/app/src/views/domain/DomainInfo.vue b/app/src/views/domain/DomainInfo.vue
index 05dd323e..c63b5119 100644
--- a/app/src/views/domain/DomainInfo.vue
+++ b/app/src/views/domain/DomainInfo.vue
@@ -115,7 +115,6 @@ export default {
     return {
       queries: [
         ['GET', { uri: 'domains', storeKey: 'domains' }],
-        ['GET', { uri: 'domains/main', storeKey: 'main_domain' }],
         ['GET', { uri: 'domains', storeKey: 'domains_details', param: this.name }],
         ['GET', `domains/${this.name}/config?full`]
       ],
diff --git a/app/src/views/domain/DomainList.vue b/app/src/views/domain/DomainList.vue
index 30b913f4..e669d063 100644
--- a/app/src/views/domain/DomainList.vue
+++ b/app/src/views/domain/DomainList.vue
@@ -54,7 +54,6 @@ export default {
   data () {
     return {
       queries: [
-        ['GET', { uri: 'domains/main', storeKey: 'main_domain' }],
         ['GET', { uri: 'domains', storeKey: 'domains' }]
       ],
       search: '',
diff --git a/app/src/views/user/UserCreate.vue b/app/src/views/user/UserCreate.vue
index 1ae9e7c5..2be64956 100644
--- a/app/src/views/user/UserCreate.vue
+++ b/app/src/views/user/UserCreate.vue
@@ -57,8 +57,7 @@ export default {
     return {
       queries: [
         ['GET', { uri: 'users' }],
-        ['GET', { uri: 'domains' }],
-        ['GET', { uri: 'domains/main', storeKey: 'main_domain' }]
+        ['GET', { uri: 'domains' }]
       ],
 
       form: {
diff --git a/app/src/views/user/UserEdit.vue b/app/src/views/user/UserEdit.vue
index e6171eb1..54028822 100644
--- a/app/src/views/user/UserEdit.vue
+++ b/app/src/views/user/UserEdit.vue
@@ -115,7 +115,6 @@ export default {
     return {
       queries: [
         ['GET', { uri: 'users', param: this.name, storeKey: 'users_details' }],
-        ['GET', { uri: 'domains/main', storeKey: 'main_domain' }],
         ['GET', { uri: 'domains' }]
       ],