diff --git a/client/layouts/default.vue b/client/layouts/default.vue
index 9f15af67..4b972924 100644
--- a/client/layouts/default.vue
+++ b/client/layouts/default.vue
@@ -199,7 +199,7 @@ export default {
           }
         } else {
           console.error('User has no more accessible libraries')
-          this.$store.commit('libraries/setCurrentLibrary', null)
+          this.$store.commit('libraries/setCurrentLibrary', { id: null })
         }
       }
     },
diff --git a/client/pages/login.vue b/client/pages/login.vue
index b6235845..ef3827af 100644
--- a/client/pages/login.vue
+++ b/client/pages/login.vue
@@ -189,7 +189,7 @@ export default {
         require('@/plugins/chromecast.js').default(this)
       }
 
-      this.$store.commit('libraries/setCurrentLibrary', userDefaultLibraryId)
+      this.$store.commit('libraries/setCurrentLibrary', { id: userDefaultLibraryId })
       this.$store.commit('user/setUser', user)
       // Access token only returned from login, not authorize
       if (user.accessToken) {
diff --git a/client/store/libraries.js b/client/store/libraries.js
index 8964d9f1..62c515eb 100644
--- a/client/store/libraries.js
+++ b/client/store/libraries.js
@@ -133,7 +133,7 @@ export const actions = {
         commit('setNumUserPlaylists', numUserPlaylists)
         commit('scanners/setCustomMetadataProviders', customMetadataProviders, { root: true })
 
-        commit('setCurrentLibrary', libraryId)
+        commit('setCurrentLibrary', { id: libraryId })
         return data
       })
       .catch((error) => {
@@ -182,8 +182,8 @@ export const mutations = {
   setLibraryIssues(state, val) {
     state.issues = val
   },
-  setCurrentLibrary(state, val) {
-    state.currentLibraryId = val
+  setCurrentLibrary(state, { id }) {
+    state.currentLibraryId = id
   },
   set(state, libraries) {
     state.libraries = libraries
diff --git a/client/store/user.js b/client/store/user.js
index 158ec8f4..96e79d12 100644
--- a/client/store/user.js
+++ b/client/store/user.js
@@ -152,7 +152,6 @@ export const actions = {
       .$post('/auth/refresh')
       .then(async (response) => {
         const newAccessToken = response.user.accessToken
-        commit('setUser', response.user)
         commit('setAccessToken', newAccessToken)
         // Emit event used to re-authenticate socket in default.vue since $root is not available here
         if (this.$eventBus) {