diff --git a/lib/player/player_service.dart b/lib/player/player_service.dart
index a5ac9f94b..8698ae9b1 100644
--- a/lib/player/player_service.dart
+++ b/lib/player/player_service.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:audio_service/audio_service.dart';
@@ -143,6 +142,7 @@ class PlayerService {
     await _player.dispose();
   }
 
+  List<Audio>? _oldQueue;
   Queue _queue = (name: '', audios: []);
   Queue get queue => _queue;
   void setQueue(Queue value) {
@@ -235,8 +235,13 @@ class PlayerService {
   void setShuffle(bool value) {
     if (value == _shuffle) return;
     _shuffle = value;
-    if (value && queue.audios.length > 1) {
-      _randomNext();
+    if (value) {
+      _oldQueue = _queue.audios;
+      _queue.audios.shuffle();
+    } else if (_oldQueue != null) {
+      setQueue(
+        (audios: _oldQueue!, name: _queue.name),
+      );
     }
     _propertiesChangedController.add(true);
   }
@@ -374,30 +379,14 @@ class PlayerService {
     if (queue.audios.isNotEmpty && queue.audios.contains(audio)) {
       final currentIndex = queue.audios.indexOf(audio!);
 
-      if (shuffle && queue.audios.length > 1) {
-        _randomNext();
+      if (currentIndex == queue.audios.length - 1) {
+        nextAudio = queue.audios.elementAt(0);
       } else {
-        if (currentIndex == queue.audios.length - 1) {
-          nextAudio = queue.audios.elementAt(0);
-        } else {
-          nextAudio = queue.audios.elementAt(queue.audios.indexOf(audio!) + 1);
-        }
+        nextAudio = queue.audios.elementAt(queue.audios.indexOf(audio!) + 1);
       }
     }
   }
 
-  void _randomNext() {
-    if (audio == null) return;
-    final currentIndex = queue.audios.indexOf(audio!);
-    final max = queue.audios.length;
-    final random = Random();
-    var randomIndex = random.nextInt(max);
-    while (randomIndex == currentIndex) {
-      randomIndex = random.nextInt(max);
-    }
-    nextAudio = queue.audios.elementAt(randomIndex);
-  }
-
   Future<void> playPrevious() async {
     if (queue.audios.isNotEmpty == true &&
         audio != null &&
diff --git a/lib/player/view/queue_button.dart b/lib/player/view/queue_button.dart
index 199b8073d..0ee2e537b 100644
--- a/lib/player/view/queue_button.dart
+++ b/lib/player/view/queue_button.dart
@@ -226,11 +226,13 @@ class _QueueTileState extends State<_QueueTile> {
                 RoundedRectangleBorder(borderRadius: BorderRadius.circular(6)),
             onTap: widget.queueName == null
                 ? null
-                : () => di<PlayerModel>().startPlaylist(
-                      listName: widget.queueName!,
-                      audios: widget.queue,
-                      index: widget.queue.indexOf(widget.audio),
-                    ),
+                : () => di<PlayerModel>()
+                  ..setShuffle(false)
+                  ..startPlaylist(
+                    listName: widget.queueName!,
+                    audios: widget.queue,
+                    index: widget.queue.indexOf(widget.audio),
+                  ),
             hoverColor: context.colorScheme.onSurface.withOpacity(0.3),
             leading: Visibility(
               visible: widget.selected,