diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt
index 58720bbbb3..eea7727ce4 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt
@@ -96,7 +96,7 @@ class PlaybackService : MediaLibraryService() {
     ): MediaSession.ConnectionResult {
       val connectionResult = super.onConnect(session, controller)
       val availableSessionCommands = connectionResult.availableSessionCommands.buildUpon()
-      customCommands.forEach { commandButton ->
+      for (commandButton in customCommands) {
         // Add custom command to available session commands.
         commandButton.sessionCommand?.let { availableSessionCommands.add(it) }
       }