diff --git a/NEWS b/NEWS
index f3b5c58f9..257343672 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ ver 0.15 - (200?/??/??)
 * failure to read the state file is non-fatal
 * --create-db starts the MPD daemon instead of exiting
 * playlist_directory and music_directory are optional
+* playlist: recalculate the queued song after random is toggled
 
 
 ver 0.14.1 (2009/01/17)
diff --git a/src/playlist.c b/src/playlist.c
index 3f18f6b81..cce2924c1 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -951,6 +951,9 @@ void setPlaylistRandomStatus(bool status)
 	if (status == playlist.queue.random)
 		return;
 
+	if (playlist.queued >= 0)
+		clearPlayerQueue();
+
 	playlist.queue.random = status;
 
 	if (playlist.queue.random) {