diff --git a/plugins/boom b/plugins/boom
index aa776347..5debfad7 100755
--- a/plugins/boom
+++ b/plugins/boom
@@ -21,21 +21,23 @@ elif which mocp >/dev/null 2>&1; then
     if [ -z "$ret" ]; then
         # start MOC server
         mocp -S
+        mocp -o shuffle
     else
         # mocp running, check if it's playing
         state=$(mocp -i | grep "State:" | cut -d' ' -f2)
         if [ "$state" = 'PLAY' ]; then
             # add up to 100 random audio files
-            find . -type f \( -iname "*.mp3" -o -iname "*.flac" -o -iname "*.m4a" -o -iname "*.webm" -o -iname "*.wma" \) | shuf -n "$NUMTRACKS" | xargs -d "\n" mocp -a
+            find . -type f \( -iname "*.mp3" -o -iname "*.flac" -o -iname "*.m4a" -o -iname "*.webm" -o -iname "*.wma" \) | head -n "$NUMTRACKS" | xargs -d "\n" mocp -a
             exit
         fi
     fi
 
     # clear MOC playlist
     mocp -c
+    mocp -o shuffle
 
     # add up to 100 random audio files
-    find . -type f \( -iname "*.mp3" -o -iname "*.flac" -o -iname "*.m4a" -o -iname "*.webm" -o -iname "*.wma" \) | shuf -n "$NUMTRACKS" | xargs -d "\n" mocp -a
+    find . -type f \( -iname "*.mp3" -o -iname "*.flac" -o -iname "*.m4a" -o -iname "*.webm" -o -iname "*.wma" \) | head -n "$NUMTRACKS" | xargs -d "\n" mocp -a
 
     # start playing
     mocp -p