diff --git a/components/app/SideDrawer.vue b/components/app/SideDrawer.vue
index 9827156b..0a36040d 100644
--- a/components/app/SideDrawer.vue
+++ b/components/app/SideDrawer.vue
@@ -122,11 +122,15 @@ export default {
       this.show = false
     },
     async logout() {
-      await this.$axios.$post('/logout').catch((error) => {
-        console.error(error)
-      })
+      if (this.user) {
+        await this.$axios.$post('/logout').catch((error) => {
+          console.error(error)
+        })
+      }
+
       this.$socket.logout()
       await this.$db.logout()
+      this.$localStore.removeLastLibraryId()
       this.$store.commit('user/logout')
       this.$router.push('/connect')
     },
diff --git a/components/bookshelf/LazyBookshelf.vue b/components/bookshelf/LazyBookshelf.vue
index 63f4fa6a..85e2dd1e 100644
--- a/components/bookshelf/LazyBookshelf.vue
+++ b/components/bookshelf/LazyBookshelf.vue
@@ -382,7 +382,7 @@ export default {
         this.resetEntities()
       }
     },
-    libraryChanged(libid) {
+    libraryChanged() {
       if (this.hasFilter) {
         this.clearFilter()
       } else {
diff --git a/components/modals/LibrariesModal.vue b/components/modals/LibrariesModal.vue
index 1876e030..c7fc936e 100644
--- a/components/modals/LibrariesModal.vue
+++ b/components/modals/LibrariesModal.vue
@@ -51,7 +51,7 @@ export default {
     async clickedOption(lib) {
       this.show = false
       await this.$store.dispatch('libraries/fetch', lib.id)
-      this.$eventBus.$emit('library-changed', lib.id)
+      this.$eventBus.$emit('library-changed')
       this.$localStore.setLastLibraryId(lib.id)
     }
   },
diff --git a/layouts/default.vue b/layouts/default.vue
index 4820acff..aef6e2fd 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -170,8 +170,8 @@ export default {
       this.inittingLibraries = true
       await this.$store.dispatch('libraries/load')
       console.log(`[default] initLibraries loaded ${this.currentLibraryId}`)
+      await this.$store.dispatch('libraries/fetch', this.currentLibraryId)
       this.$eventBus.$emit('library-changed')
-      this.$store.dispatch('libraries/fetch', this.currentLibraryId)
       this.inittingLibraries = false
     },
     async syncLocalMediaProgress() {
diff --git a/pages/account.vue b/pages/account.vue
index 357cf8fa..245e43a0 100644
--- a/pages/account.vue
+++ b/pages/account.vue
@@ -53,11 +53,15 @@ export default {
   },
   methods: {
     async logout() {
-      await this.$axios.$post('/logout').catch((error) => {
-        console.error(error)
-      })
+      if (this.user) {
+        await this.$axios.$post('/logout').catch((error) => {
+          console.error(error)
+        })
+      }
+
       this.$socket.logout()
       await this.$db.logout()
+      this.$localStore.removeLastLibraryId()
       this.$store.commit('user/logout')
       this.$router.push('/connect')
     }
diff --git a/pages/bookshelf.vue b/pages/bookshelf.vue
index b71048eb..fc0d5478 100644
--- a/pages/bookshelf.vue
+++ b/pages/bookshelf.vue
@@ -4,10 +4,6 @@
     <home-bookshelf-toolbar v-show="!isHome" />
     <div id="bookshelf-wrapper" class="main-content overflow-y-auto overflow-x-hidden relative" :class="isHome ? 'home-page' : ''">
       <nuxt-child />
-
-      <!-- <div v-if="isLoading" class="absolute top-0 left-0 w-full h-full flex items-center justify-center">
-        <ui-loading-indicator />
-      </div>-->
     </div>
   </div>
 </template>
diff --git a/pages/bookshelf/index.vue b/pages/bookshelf/index.vue
index c062e0ea..513f5f55 100644
--- a/pages/bookshelf/index.vue
+++ b/pages/bookshelf/index.vue
@@ -135,7 +135,7 @@ export default {
       }
       this.loading = false
     },
-    async libraryChanged(libid) {
+    async libraryChanged() {
       if (this.currentLibraryId) {
         await this.fetchCategories()
       }
diff --git a/plugins/localStore.js b/plugins/localStore.js
index 8352385b..b88e3411 100644
--- a/plugins/localStore.js
+++ b/plugins/localStore.js
@@ -83,7 +83,16 @@ class LocalStorage {
       await Storage.set({ key: 'lastLibraryId', value: libraryId })
       console.log('[LocalStorage] Set Last Library Id', libraryId)
     } catch (error) {
-      console.error('[LocalStorage] Failed to set current library', error)
+      console.error('[LocalStorage] Failed to set last library id', error)
+    }
+  }
+
+  async removeLastLibraryId() {
+    try {
+      await Storage.remove({ key: 'lastLibraryId' })
+      console.log('[LocalStorage] Remove Last Library Id')
+    } catch (error) {
+      console.error('[LocalStorage] Failed to remove last library id', error)
     }
   }
 
diff --git a/store/globals.js b/store/globals.js
index 8facbb91..7ceca2b0 100644
--- a/store/globals.js
+++ b/store/globals.js
@@ -22,13 +22,16 @@ export const getters = {
     if (media.coverPath.startsWith('http:') || media.coverPath.startsWith('https:')) return media.coverPath
 
     var userToken = rootGetters['user/getToken']
+    var serverAddress = rootGetters['user/getServerAddress']
+    if (!userToken || !serverAddress) return placeholder
+
     var lastUpdate = libraryItem.updatedAt || Date.now()
 
     if (process.env.NODE_ENV !== 'production') { // Testing
       // return `http://localhost:3333/api/items/${libraryItem.id}/cover?token=${userToken}&ts=${lastUpdate}`
     }
 
-    var url = new URL(`/api/items/${libraryItem.id}/cover`, rootGetters['user/getServerAddress'])
+    var url = new URL(`/api/items/${libraryItem.id}/cover`, serverAddress)
     return `${url}?token=${userToken}&ts=${lastUpdate}`
   },
   getLocalMediaProgressById: (state) => (localLibraryItemId, episodeId = null) => {
diff --git a/store/libraries.js b/store/libraries.js
index 34d6bf39..08b62fa9 100644
--- a/store/libraries.js
+++ b/store/libraries.js
@@ -90,6 +90,7 @@ export const mutations = {
   },
   reset(state) {
     state.lastLoad = 0
+    state.currentLibraryId = null
     state.libraries = []
   },
   setCurrentLibrary(state, val) {