diff --git a/Sources/Playback/Control/VLCPlaybackService.m b/Sources/Playback/Control/VLCPlaybackService.m
index 184ea340cf..dcb6589e5c 100644
--- a/Sources/Playback/Control/VLCPlaybackService.m
+++ b/Sources/Playback/Control/VLCPlaybackService.m
@@ -349,11 +349,11 @@ - (void)_playNewMedia
     if (_itemInMediaListToBePlayedFirst == -1) {
         int count = (int)_mediaList.count;
         if (_shuffleMode && count > 0) {
-                _currentIndex = arc4random_uniform(count - 1);
-                [self shuffleMediaList];
+            _itemInMediaListToBePlayedFirst = arc4random_uniform(count - 1);
+            [self shuffleMediaList];
+        } else {
+            _itemInMediaListToBePlayedFirst = 0;
         }
-
-        _itemInMediaListToBePlayedFirst = 0;
     }
 
     VLCMedia *media = [_mediaList mediaAtIndex:_itemInMediaListToBePlayedFirst];