diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
index 3271ede7..2bcb4ede 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
@@ -73,7 +73,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
 
     public void setItems(List<Song> songs) {
         this.songs = songs;
-        notifyItemRangeChanged(0, songs.size());
+        notifyDataSetChanged();
     }
 
     public Song getItem(int id) {
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
index f081c7f2..b6f9ed29 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
@@ -75,7 +75,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
 
     public void setItems(List<Song> songs) {
         this.songs = songs;
-        notifyItemRangeChanged(0, songs.size());
+        notifyDataSetChanged();
     }
 
     public Song getItem(int id) {
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
index 8a6f0958..1c140685 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
@@ -130,6 +130,10 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE
                 if (pageState != -1) {
                     MusicPlayerRemote.playSongAt(position);
                     pageState = -1;
+
+                    // TODO: Soluzione termporanea e non totalmente funzionante al problema del cambio colore
+                    // TODO: |_ delle righe delle canzoni già riprodotte
+                    playerSongQueueAdapter.notifyDataSetChanged();
                 }
             }
         });