diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
index cdec7243..86178b87 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
@@ -92,12 +92,13 @@ public class RecentMusicAdapter extends RecyclerView.Adapter<RecentMusicAdapter.
         @Override
         public void onClick(View view) {
             QueueRepository queueRepository = new QueueRepository(App.getInstance());
-            queueRepository.insertAllAndStartNew(songs.subList(getBindingAdapterPosition(), songs.size()));
+            queueRepository.insertAllAndStartNew(songs);
 
             mainActivity.isBottomSheetInPeek(true);
             mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
 
-            MusicPlayerRemote.openQueue(songs.subList(getBindingAdapterPosition(), songs.size()), 0, true);
+            MusicPlayerRemote.openQueue(songs, getBindingAdapterPosition(), true);
+
         }
 
         @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
index f76c175e..1097932b 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
@@ -116,12 +116,12 @@ public class SongResultSearchAdapter extends RecyclerView.Adapter<SongResultSear
         @Override
         public void onClick(View view) {
             QueueRepository queueRepository = new QueueRepository(App.getInstance());
-            queueRepository.insertAllAndStartNew(songs.subList(getBindingAdapterPosition(), songs.size()));
+            queueRepository.insertAllAndStartNew(songs);
 
             mainActivity.isBottomSheetInPeek(true);
             mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
 
-            MusicPlayerRemote.openQueue(songs.subList(getBindingAdapterPosition(), songs.size()), 0, true);
+            MusicPlayerRemote.openQueue(songs, getBindingAdapterPosition(), true);
         }
 
         @Override