diff --git a/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
index fe206b18..4fa27220 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
@@ -69,11 +69,10 @@ public class ArtistRepository {
                                 artists.addAll(MappingUtil.mapArtist(index.getArtists()));
                             }
 
-                            if(random) {
+                            if (random) {
                                 Collections.shuffle(artists);
                                 getArtistInfo(artists.subList(0, artists.size() / size > 0 ? size : artists.size()), listLiveArtists);
-                            }
-                            else {
+                            } else {
                                 listLiveArtists.setValue(artists);
                             }
                         }
@@ -92,7 +91,7 @@ public class ArtistRepository {
      */
     public void getArtistInfo(List<Artist> artists, MutableLiveData<List<Artist>> list) {
         List<Artist> liveArtists = list.getValue();
-        if(liveArtists == null) liveArtists = new ArrayList<>();
+        if (liveArtists == null) liveArtists = new ArrayList<>();
         list.setValue(liveArtists);
 
         for (Artist artist : artists) {
@@ -146,7 +145,7 @@ public class ArtistRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(Call<SubsonicResponse> call, Response<SubsonicResponse> response) {
-                        artistFullInfo.setValue(MappingUtil.mapArtist(response.body().getArtistInfo2()));
+                        if (response.body().getArtistInfo2() != null) artistFullInfo.setValue(MappingUtil.mapArtist(response.body().getArtistInfo2()));
                     }
 
                     @Override
@@ -270,7 +269,7 @@ public class ArtistRepository {
                                 for (int index = 0; index < albums.size(); index++) {
                                     albumRepository.getAlbumTracks(albums.get(index).getId()).observe(fragmentActivity, songs -> {
                                         ArrayList<Song> liveSongs = randomSongs.getValue();
-                                        if(liveSongs == null) liveSongs = new ArrayList<>();
+                                        if (liveSongs == null) liveSongs = new ArrayList<>();
                                         Collections.shuffle(liveSongs);
                                         liveSongs.addAll(songs);
                                         randomSongs.setValue(liveSongs);
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
index d3d07a06..b8926490 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
@@ -113,13 +113,12 @@ public class ArtistPageFragment extends Fragment {
     }
 
     private void initArtistInfo() {
-
         artistPageViewModel.getArtistInfo(artistPageViewModel.getArtist().getId()).observe(requireActivity(), artist -> {
             if (bind != null) bind.artistPageBioSector.setVisibility(artist.getBio() != null ? View.VISIBLE : View.GONE);
             if (bind != null) bind.bioMoreTextViewClickable.setVisibility(artist.getLastfm() != null ? View.VISIBLE : View.GONE);
 
             CustomGlideRequest.Builder
-                    .from(requireContext(), null, CustomGlideRequest.ARTIST_PIC, artist.getImageUrl())
+                    .from(requireContext(), /*artistPageViewModel.getArtist().getId()*/ null, CustomGlideRequest.ARTIST_PIC, artist.getImageUrl())
                     .build()
                     .into(bind.artistBackdropImageView);