diff --git a/src/playlist.c b/src/playlist.c
index 6fb0e9227..00341ce06 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -772,7 +772,7 @@ void nextSongInPlaylist(void)
 		return;
 	}
 
-	if (next_order == 0) {
+	if (next_order == 0 && playlist.queue.random) {
 		assert(playlist.queue.repeat);
 
 		queue_shuffle_order(&playlist.queue);