diff --git a/lib/screens/now_playing_screen.dart b/lib/screens/now_playing_screen.dart
index 8126def5..b70ba350 100644
--- a/lib/screens/now_playing_screen.dart
+++ b/lib/screens/now_playing_screen.dart
@@ -741,9 +741,11 @@ class _NowPlayingScreenState extends ConsumerState<NowPlayingScreen> {
                 final queue = ref.watch(playQueueProvider).value ?? const [];
                 final current = ref.watch(currentMediaItemProvider).value;
                 final controller = ref.read(musicPlayerControllerProvider);
-                final shuffleOn =
-                    ref.watch(playbackStateProvider).value?.shuffleMode ==
-                    AudioServiceShuffleMode.all;
+                final shuffleOn = ref.watch(
+                  playbackStateProvider.select(
+                    (s) => s.value?.shuffleMode == AudioServiceShuffleMode.all,
+                  ),
+                );
                 final textTheme = Theme.of(context).textTheme;
 
                 return Column(