diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/ShuffleHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/ShuffleHelper.java
index 699ee8e7..c55da086 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/ShuffleHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/ShuffleHelper.java
@@ -13,6 +13,7 @@ import java.util.List;
 public class ShuffleHelper {
 
     public static void makeShuffleList(@NonNull List<Song> listToShuffle, final int current) {
+        if (listToShuffle.isEmpty()) return;
         if (current >= 0) {
             Song song = listToShuffle.remove(current);
             Collections.shuffle(listToShuffle);