diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index 7ea8fa254..5bb8546e7 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -186,7 +186,16 @@ import 'emby-itemscontainer';
 
         const updateFilterControls = (tabContent) => {
             const query = getQuery();
-            this.alphaPicker.value(query.NameStartsWithOrGreater);
+
+            if (this.alphaPicker) {
+                this.alphaPicker.value(query.NameStartsWithOrGreater);
+
+                if (query.SortBy.indexOf('SortName') === 0) {
+                    this.alphaPicker.visible(true);
+                } else {
+                    this.alphaPicker.visible(false);
+                }
+            }
         };
 
         let savedQueryKey;