diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 4dc1100c1e..3a4a80733d 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -232,9 +232,9 @@ public final class MediaSessionConnector {
      */
     void onSkipToNext(Player player);
     /**
-     * See {@link MediaSessionCompat.Callback#onSetShuffleModeEnabled(boolean)}.
+     * See {@link MediaSessionCompat.Callback#onSetShuffleMode(int)}.
      */
-    void onSetShuffleModeEnabled(Player player, boolean enabled);
+    void onSetShuffleMode(Player player, int shuffleMode);
   }
 
   /**
@@ -803,15 +803,15 @@ public final class MediaSessionConnector {
     @Override
     public void onSetShuffleModeEnabled(boolean enabled) {
       if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
-        queueNavigator.onSetShuffleModeEnabled(player, enabled);
+        queueNavigator.onSetShuffleMode(player, enabled
+            ? PlaybackStateCompat.SHUFFLE_MODE_ALL : PlaybackStateCompat.SHUFFLE_MODE_NONE);
       }
     }
 
     @Override
     public void onSetShuffleMode(int shuffleMode) {
       if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
-        queueNavigator.onSetShuffleModeEnabled(player,
-            shuffleMode != PlaybackStateCompat.SHUFFLE_MODE_NONE);
+        queueNavigator.onSetShuffleMode(player, shuffleMode);
       }
     }
 
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index 9d7ed75c83..8c7d3be114 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -160,8 +160,8 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   }
 
   @Override
-  public void onSetShuffleModeEnabled(Player player, boolean enabled) {
-    player.setShuffleModeEnabled(enabled);
+  public void onSetShuffleMode(Player player, int shuffleMode) {
+    player.setShuffleModeEnabled(shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL);
   }
 
   private void publishFloatingQueueWindow(Player player) {