diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 0fbdacbd..600ba8f0 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -9,10 +9,11 @@ export default {
   bootstrap ({ commit, dispatch, state }) {
     return new Promise((resolve, reject) => {
       window.axios.get('/api/bootstrap').then((response) => {
+        commit('company/' + companyTypes.BOOTSTRAP_COMPANIES, response.data.companies)
+        commit('company/' + companyTypes.SET_SELECTED_COMPANY, response.data.company)
         commit('currency/' + currencyTypes.BOOTSTRAP_CURRENCIES, response.data)
         commit('currency/' + currencyTypes.SET_DEFAULT_CURRENCY, response.data)
         commit('user/' + userTypes.BOOTSTRAP_CURRENT_USER, response.data.user)
-        commit('company/' + companyTypes.BOOTSTRAP_COMPANIES, response.data.companies)
         commit('taxType/' + taxTypeTypes.BOOTSTRAP_TAX_TYPES, response.data.taxTypes)
         commit('preferences/' + preferencesTypes.SET_MOMENT_DATE_FORMAT, response.data.moment_date_format)
         commit('preferences/' + preferencesTypes.SET_LANGUAGE_FORMAT, response.data.default_language)
diff --git a/resources/assets/js/store/modules/company/actions.js b/resources/assets/js/store/modules/company/actions.js
index 441396cd..44efa707 100644
--- a/resources/assets/js/store/modules/company/actions.js
+++ b/resources/assets/js/store/modules/company/actions.js
@@ -1,7 +1,5 @@
 import * as types from './mutation-types'
-import Ls from '@/services/ls'
 
 export const setSelectedCompany = ({ commit, dispatch, state }, data) => {
-  Ls.set('selectedCompany', data.id)
   commit(types.SET_SELECTED_COMPANY, data)
 }
diff --git a/resources/assets/js/store/modules/company/mutations.js b/resources/assets/js/store/modules/company/mutations.js
index 71a5a9cd..405f1eac 100644
--- a/resources/assets/js/store/modules/company/mutations.js
+++ b/resources/assets/js/store/modules/company/mutations.js
@@ -1,4 +1,5 @@
 import * as types from './mutation-types'
+import Ls from '@/services/ls'
 
 export default {
   [types.BOOTSTRAP_COMPANIES] (state, companies) {
@@ -6,6 +7,7 @@ export default {
     state.selectedCompany = companies[0]
   },
   [types.SET_SELECTED_COMPANY] (state, company) {
+    Ls.set('selectedCompany', company.id)
     state.selectedCompany = company
   }
 }