diff --git a/backend/mediaprovider/subsonic/subsonicmediaprovider.go b/backend/mediaprovider/subsonic/subsonicmediaprovider.go
index b9270401..a51bca64 100644
--- a/backend/mediaprovider/subsonic/subsonicmediaprovider.go
+++ b/backend/mediaprovider/subsonic/subsonicmediaprovider.go
@@ -1,6 +1,7 @@
 package subsonic
 
 import (
+	"errors"
 	"image"
 	"math"
 	"strconv"
@@ -74,15 +75,18 @@ func (s *subsonicMediaProvider) GetArtist(artistID string) (*mediaprovider.Artis
 }
 
 func (s *subsonicMediaProvider) GetArtistInfo(artistID string) (*mediaprovider.ArtistInfo, error) {
-	info, err := s.client.GetArtistInfo(artistID, map[string]string{})
+	info, err := s.client.GetArtistInfo2(artistID, map[string]string{})
 	if err != nil {
 		return nil, err
 	}
+	if info == nil {
+		return nil, errors.New("server returned empty artist info")
+	}
 	return &mediaprovider.ArtistInfo{
 		Biography:      info.Biography,
 		LastFMUrl:      info.LastFmUrl,
 		ImageURL:       info.LargeImageUrl,
-		SimilarArtists: sharedutil.MapSlice(info.SimilarArtist, toArtist),
+		SimilarArtists: sharedutil.MapSlice(info.SimilarArtist, toArtistFromID3),
 	}, nil
 }
 
@@ -294,17 +298,6 @@ func fillAlbum(subAlbum *subsonic.AlbumID3, album *mediaprovider.Album) {
 	album.Favorite = !subAlbum.Starred.IsZero()
 }
 
-func toArtist(ar *subsonic.Artist) *mediaprovider.Artist {
-	if ar == nil {
-		return nil
-	}
-	return &mediaprovider.Artist{
-		ID:       ar.ID,
-		Name:     ar.Name,
-		Favorite: !ar.Starred.IsZero(),
-	}
-}
-
 func toArtistFromID3(ar *subsonic.ArtistID3) *mediaprovider.Artist {
 	if ar == nil {
 		return nil