diff --git a/src/components/ADempiere/Dashboard/index.vue b/src/components/ADempiere/Dashboard/index.vue
index 7d5baca3..fb664969 100644
--- a/src/components/ADempiere/Dashboard/index.vue
+++ b/src/components/ADempiere/Dashboard/index.vue
@@ -134,7 +134,7 @@ export default {
   },
   methods: {
     sendMain(dashboard) {
-      this.$store.commit('setMainDashboard', dashboard)
+      this.$store.dispatch('mainDashboard', dashboard)
       this.$forceUpdate()
     }
   }
diff --git a/src/store/modules/ADempiere/dashboard.js b/src/store/modules/ADempiere/dashboard.js
index 3b52cabd..4fab7b40 100644
--- a/src/store/modules/ADempiere/dashboard.js
+++ b/src/store/modules/ADempiere/dashboard.js
@@ -73,6 +73,9 @@ const dashboard = {
             console.warn(`Error getting List Dashboards: ${error.message}. Code: ${error.code}.`)
           })
       })
+    },
+    mainDashboard({ commit }, dashboard) {
+      commit('setMainDashboard', dashboard)
     }
   },
   getters: {
@@ -85,6 +88,9 @@ const dashboard = {
       return state.dashboard.find(
         item => item.roleUuid === roleUuid
       )
+    },
+    getMainDashboard: (state) => {
+      return state.mainashboard
     }
   }
 }
diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue
index 70bd07b1..4c83228c 100644
--- a/src/views/dashboard/admin/index.vue
+++ b/src/views/dashboard/admin/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="dashboard-editor-container">
     <el-row :gutter="8">
-      <el-col :span="24" style="padding-right:8px;margin-bottom:2px;">
+      <el-col v-if="!isEmptyValue(mainashboard)" :span="24" style="padding-right:8px;margin-bottom:2px;">
         <dashboard
           :metadata="mainashboard"
           :title="mainashboard.name"
@@ -41,7 +41,7 @@ export default {
       return this.$store.getters.getRoleUuid
     },
     mainashboard() {
-      return this.$store.state.dashboard.mainashboard
+      return this.$store.getters.getMainDashboard
     }
   },
   watch: {
@@ -63,7 +63,7 @@ export default {
       })
         .then(response => {
           if (this.isEmptyValue(this.mainashboard)) {
-            this.$store.commit('setMainDashboard', response.dashboardsList[1])
+            this.$store.dispatch('mainDashboard', response.dashboardsList[1])
           }
           this.dashboardList = response.dashboardsList
           this.$forceUpdate()