=== Slim/Player/Playlist.pm
==================================================================
--- Slim/Player/Playlist.pm	(revision 33099)
+++ Slim/Player/Playlist.pm	(local)
@@ -136,6 +136,13 @@
 		Slim::Control::Jive::shuffleSettings($client);
 	}
 	
+	# If Random Play mode is active, return 0
+	if (   exists $INC{'Slim/Plugin/RandomPlay/Plugin.pm'} 
+		&& Slim::Plugin::RandomPlay::Plugin::active($client)
+	) {
+		return 0;
+	}
+	
 	return $prefs->client($client)->get('shuffle');
 }
 
=== Slim/Plugin/RandomPlay/Plugin.pm
==================================================================
--- Slim/Plugin/RandomPlay/Plugin.pm	(revision 33099)
+++ Slim/Plugin/RandomPlay/Plugin.pm	(local)
@@ -470,10 +470,6 @@
 		));
 	}
 
-	# temporarily turn off shuffle while we add new stuff
-	my $oldshuffle = Slim::Player::Playlist::shuffle($client);
-	Slim::Player::Playlist::shuffle($client, 0);
-
 	# Replace the current playlist with the first item / track or add it to end
 	my $request = $client->execute([
 		'playlist', $addOnly ? 'addtracks' : 'loadtracks', sprintf('%s.id=%d', $type, $obj->id)
@@ -497,7 +493,6 @@
 		}
 	}
 
-	Slim::Player::Playlist::shuffle($client, $oldshuffle);
 	return $obj->name;
 }
 
@@ -1023,7 +1018,7 @@
 		playRandom($client, $mixInfo{$client->masterOrSelf->id}->{'type'});
 
 		return;
-	}		
+	}
 
 	my $songIndex = Slim::Player::Source::streamingSongIndex($client);