diff --git a/client/pages/author/_id.vue b/client/pages/author/_id.vue
index 4630c822..0618f8a7 100644
--- a/client/pages/author/_id.vue
+++ b/client/pages/author/_id.vue
@@ -56,8 +56,8 @@ export default {
       return redirect(`/library/${store.state.libraries.currentLibraryId}/authors`)
     }
 
-    if (query.library) {
-      store.commit('libraries/setCurrentLibrary', query.library)
+    if (store.state.libraries.currentLibraryId !== author.libraryId || !store.state.libraries.filterData) {
+      await store.dispatch('libraries/fetch', author.libraryId)
     }
 
     return {
diff --git a/client/pages/library/_library/podcast/download-queue.vue b/client/pages/library/_library/podcast/download-queue.vue
index dd57748d..49b4d4da 100644
--- a/client/pages/library/_library/podcast/download-queue.vue
+++ b/client/pages/library/_library/podcast/download-queue.vue
@@ -54,11 +54,19 @@
 
 <script>
 export default {
-  async asyncData({ params, redirect }) {
-    if (!params.library) {
-      console.error('No library...', params.library)
-      return redirect('/')
+  async asyncData({ params, redirect, store }) {
+    var libraryId = params.library
+    var libraryData = await store.dispatch('libraries/fetch', libraryId)
+    if (!libraryData) {
+      return redirect('/oops?message=Library not found')
     }
+
+    // Redirect book libraries
+    const library = libraryData.library
+    if (library.mediaType === 'book') {
+      return redirect(`/library/${libraryId}`)
+    }
+
     return {
       libraryId: params.library
     }
@@ -124,10 +132,6 @@ export default {
     }
   },
   mounted() {
-    if (this.libraryId) {
-      this.$store.commit('libraries/setCurrentLibrary', this.libraryId)
-    }
-
     this.loadInitialDownloadQueue()
   },
   beforeDestroy() {