diff --git a/client/components/controls/OrderSelect.vue b/client/components/controls/OrderSelect.vue
index 99d3558a..47e5f335 100644
--- a/client/components/controls/OrderSelect.vue
+++ b/client/components/controls/OrderSelect.vue
@@ -131,6 +131,9 @@ export default {
         this.selectedDesc = !this.selectedDesc
       } else {
         this.selected = val
+        if (val == 'media.metadata.title' || val == 'media.metadata.author' || val == 'media.metadata.authorName' || val == 'media.metadata.authorNameLF') {
+          this.selectedDesc = false
+        }
       }
       this.showMenu = false
       this.$nextTick(() => this.$emit('change', val))
diff --git a/server/objects/user/User.js b/server/objects/user/User.js
index 6c71209a..53d97480 100644
--- a/server/objects/user/User.js
+++ b/server/objects/user/User.js
@@ -57,7 +57,7 @@ class User {
       mobileOrderBy: 'recent',
       mobileOrderDesc: true,
       mobileFilterBy: 'all',
-      orderBy: 'book.title',
+      orderBy: 'media.metadata.title',
       orderDesc: false,
       filterBy: 'all',
       playbackRate: 1,