diff --git a/libraries/session/src/main/java/androidx/media3/session/CommandButton.java b/libraries/session/src/main/java/androidx/media3/session/CommandButton.java
index 48b0f40201..ecae2d595e 100644
--- a/libraries/session/src/main/java/androidx/media3/session/CommandButton.java
+++ b/libraries/session/src/main/java/androidx/media3/session/CommandButton.java
@@ -651,10 +651,9 @@ public final class CommandButton implements Bundleable {
    */
   /* package */ static boolean isEnabled(
       CommandButton button, SessionCommands sessionCommands, Player.Commands playerCommands) {
-    return playerCommands.contains(button.playerCommand)
-        || (button.sessionCommand != null && sessionCommands.contains(button.sessionCommand))
+    return (button.sessionCommand != null && sessionCommands.contains(button.sessionCommand))
         || (button.playerCommand != Player.COMMAND_INVALID
-            && sessionCommands.contains(button.playerCommand));
+            && playerCommands.contains(button.playerCommand));
   }
 
   // Bundleable implementation.
diff --git a/libraries/session/src/test/java/androidx/media3/session/CommandButtonTest.java b/libraries/session/src/test/java/androidx/media3/session/CommandButtonTest.java
index 11023dafdb..2a74567d40 100644
--- a/libraries/session/src/test/java/androidx/media3/session/CommandButtonTest.java
+++ b/libraries/session/src/test/java/androidx/media3/session/CommandButtonTest.java
@@ -47,23 +47,6 @@ public class CommandButtonTest {
         .isTrue();
   }
 
-  @Test
-  public void isEnabled_playerCommandAvailableOrUnavailableInSessionCommands_isEnabledCorrectly() {
-    CommandButton button =
-        new CommandButton.Builder()
-            .setDisplayName("button")
-            .setIconResId(R.drawable.media3_notification_small_icon)
-            .setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
-            .build();
-    SessionCommands availableSessionCommands =
-        SessionCommands.EMPTY.buildUpon().add(Player.COMMAND_SEEK_TO_NEXT).build();
-
-    assertThat(CommandButton.isEnabled(button, SessionCommands.EMPTY, Player.Commands.EMPTY))
-        .isFalse();
-    assertThat(CommandButton.isEnabled(button, availableSessionCommands, Player.Commands.EMPTY))
-        .isTrue();
-  }
-
   @Test
   public void isEnabled_sessionCommandAvailableOrUnavailable_isEnabledCorrectly() {
     SessionCommand command1 = new SessionCommand("command1", Bundle.EMPTY);