diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
index 0d3a1515..30ec071b 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
@@ -144,7 +144,7 @@ public class AlbumPageFragment extends Fragment {
 
     private void initMusicButton() {
         albumPageViewModel.getAlbumSongLiveList().observe(requireActivity(), songs -> {
-            if (bind != null) {
+            if (bind != null && !songs.isEmpty()) {
                 bind.albumPagePlayButton.setOnClickListener(v -> {
                     QueueRepository queueRepository = new QueueRepository(App.getInstance());
                     queueRepository.insertAllAndStartNew(songs);
@@ -167,6 +167,11 @@ public class AlbumPageFragment extends Fragment {
                     MusicPlayerRemote.openQueue(songs, 0, true);
                 });
             }
+
+            if(bind != null && songs.isEmpty()) {
+                bind.albumPagePlayButton.setEnabled(false);
+                bind.albumPageShuffleButton.setEnabled(false);
+            }
         });
     }
 
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 f1053fa0..57b0e680 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
@@ -145,6 +145,8 @@ public class ArtistPageFragment extends Fragment {
 
                     MusicPlayerRemote.openQueue(songs, 0, true);
                     activity.isBottomSheetInPeek(true);
+                } else {
+                    Toast.makeText(requireContext(), "Error retrieving artist's songs", Toast.LENGTH_SHORT).show();
                 }
             });
         });