Index: Slim/Control/Commands.pm
===================================================================
--- Slim/Control/Commands.pm	(revision 6229)
+++ Slim/Control/Commands.pm	(working copy)
@@ -986,7 +986,7 @@
 		# saved playlist - resume if we can. Bug 1582
 		my $playlistObj = $client->currentPlaylist();
 
-		if ($playlistObj && ref($playlistObj) && $playlistObj->content_type =~ /^(?:ssp|m3u)$/) {
+		if ($playlistObj && ref($playlistObj) && $playlistObj->content_type =~ /^(?:ssp|m3u)$/ && !Slim::Player::Playlist::shuffle($client)) {
 
 			$jumpToIndex = Slim::Formats::Parse::readCurTrackForM3U( $client->currentPlaylist->path );
 
Index: Slim/Player/Playlist.pm
===================================================================
--- Slim/Player/Playlist.pm	(revision 6229)
+++ Slim/Player/Playlist.pm	(working copy)
@@ -633,7 +633,7 @@
 		$playlist = $client->currentPlaylist;
 	}
 
-	return if Slim::Music::Info::isRemoteURL($playlist);
+	return if Slim::Music::Info::isRemoteURL($playlist) || Slim::Player::Playlist::shuffle($client);
 
 	$::d_playlist && msg("Playlist: newSongPlaylistCallback() writeCurTrackForM3U()\n");