diff --git a/src/js/services/google/middleware.js b/src/js/services/google/middleware.js
index 609245b6e..03e286f98 100755
--- a/src/js/services/google/middleware.js
+++ b/src/js/services/google/middleware.js
@@ -109,7 +109,7 @@ const GoogleMiddleware = (function () {
             for (let i = 0; i < response.length; i++) {
               // Convert local URI to actual artist URI
               // See https://github.com/mopidy/mopidy-local-sqlite/issues/39
-              response[i].uri = response[i].uri.replace('local:directory?albumartist=', '');
+              response[i].uri = response[i].uri.replace('local:directory?artist=', '');
               uris.push(response[i].uri);
             }
 
diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index 47461684d..b9c340c15 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -2031,7 +2031,7 @@ const MopidyMiddleware = (function () {
             for (let i = 0; i < response.length; i++) {
               // Convert local URI to actual artist URI
               // See https://github.com/mopidy/mopidy-local-sqlite/issues/39
-              response[i].uri = response[i].uri.replace('local:directory?albumartist=', '');
+              response[i].uri = response[i].uri.replace('local:directory?artist=', '');
               uris.push(response[i].uri);
             }
 
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 28e64d05f..321179cd0 100755
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -76,7 +76,7 @@ let state = {
     play_state: null,
     uri_schemes: [],
     library_albums_uri: 'local:directory?type=album',
-    library_artists_uri: 'local:directory?type=artist&role=albumartist',
+    library_artists_uri: 'local:directory?type=artist&role=artist',
   },
   pusher: {
     connected: false,