diff --git a/plugins/boom b/plugins/boom
index 0ca9ab73..460b9dd6 100755
--- a/plugins/boom
+++ b/plugins/boom
@@ -12,11 +12,11 @@ NUMTRACKS=100
 
 if [ ! -z "$GUIPLAYER" ]; then
     PLAYER="$GUIPLAYER"
-    find . -type f \( -iname "*.mp3" -o -iname "*.flac" -o -iname "*.m4a" -o -iname "*.webm" -o -iname "*.wma" \) | sort -R | head -n $NUMTRACKS | xargs -d "\n" "$PLAYER" > /dev/null 2>&1 &
+    find . -type f \( -iname "*.mp3" -o -iname "*.flac" -o -iname "*.m4a" -o -iname "*.webm" -o -iname "*.wma" \) | shuf | head -n $NUMTRACKS | xargs -d "\n" "$PLAYER" > /dev/null 2>&1 &
 
     # detach the player
     sleep 1
-else
+elif which mocp >/dev/null 2>&1; then
     # start MOC server
     mocp -S
 
@@ -24,8 +24,11 @@ else
     mocp -c
 
     # add up to 100 random audio files
-    find . -type f \( -iname "*.mp3" -o -iname "*.flac" -o -iname "*.m4a" -o -iname "*.webm" -o -iname "*.wma" \) | sort -R | head -n $NUMTRACKS | xargs -d "\n" mocp -a
+    find . -type f \( -iname "*.mp3" -o -iname "*.flac" -o -iname "*.m4a" -o -iname "*.webm" -o -iname "*.wma" \) | shuf | head -n $NUMTRACKS | xargs -d "\n" mocp -a
 
     # start playing
     mocp -p
+else
+    printf "moc missing"
+    read -r _
 fi