diff --git a/just_audio_background/lib/just_audio_background.dart b/just_audio_background/lib/just_audio_background.dart
index b32f7f845..fd9073e09 100644
--- a/just_audio_background/lib/just_audio_background.dart
+++ b/just_audio_background/lib/just_audio_background.dart
@@ -433,6 +433,7 @@ class _PlayerAudioHandler extends BaseAudioHandler
 
   Future<LoadResponse> customLoad(LoadRequest request) async {
     _source = request.audioSourceMessage;
+    _updateShuffleIndices();
     _updateQueue();
     final response = await (await _player).load(LoadRequest(
       audioSourceMessage: _source!,