diff --git a/src/playlist.cpp b/src/playlist.cpp
index 2d79064..ab4bf77 100644
--- a/src/playlist.cpp
+++ b/src/playlist.cpp
@@ -105,6 +105,9 @@ Entry playlistCurrent() {
 }
 
 Entry playlistNext(const int amount) {
+  if (playlistRandom) {
+    return playlistSet(random(static_cast<long>(playlistEntries.size())));
+  }
   if (amount < 0 && playlistIndex <= 0 && !playlistRepeatAll) {
     return Entry();
   }