diff --git a/demos/main/src/main/java/androidx/media3/demo/main/IntentUtil.java b/demos/main/src/main/java/androidx/media3/demo/main/IntentUtil.java
index ab61e86f39c..2b50b7adbf8 100644
--- a/demos/main/src/main/java/androidx/media3/demo/main/IntentUtil.java
+++ b/demos/main/src/main/java/androidx/media3/demo/main/IntentUtil.java
@@ -67,7 +67,7 @@ public class IntentUtil {
   public static final String SUBTITLE_URI_EXTRA = "subtitle_uri";
   public static final String SUBTITLE_MIME_TYPE_EXTRA = "subtitle_mime_type";
   public static final String SUBTITLE_LANGUAGE_EXTRA = "subtitle_language";
-  public static final String PLAYER_REPEAT_MODE_EXTRA = "repeat_mode";
+  public static final String REPEAT_MODE_EXTRA = "repeat_mode";
 
   public static @Player.RepeatMode int parseRepeatModeExtra(String repeatMode) {
     switch (repeatMode) {
diff --git a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
index c0c9db93b7f..9e066bd94a6 100644
--- a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
+++ b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
@@ -262,8 +262,8 @@ protected void setContentView() {
    * @return Whether initialization was successful.
    */
   protected boolean initializePlayer() {
+    Intent intent = getIntent();
     if (player == null) {
-      Intent intent = getIntent();
 
       mediaItems = createMediaItems(intent);
       if (mediaItems.isEmpty()) {
@@ -293,11 +293,9 @@ protected boolean initializePlayer() {
     }
     player.setMediaItems(mediaItems, /* resetPosition= */ !haveStartPosition);
     player.prepare();
-    String requestedRepeatModeExtra;
-    if ((requestedRepeatModeExtra =
-            this.getIntent().getStringExtra(IntentUtil.PLAYER_REPEAT_MODE_EXTRA))
-        != null) {
-      player.setRepeatMode(IntentUtil.parseRepeatModeExtra(requestedRepeatModeExtra));
+    String repeatModeExtra = intent.getStringExtra(IntentUtil.REPEAT_MODE_EXTRA);
+    if (repeatModeExtra != null) {
+      player.setRepeatMode(IntentUtil.parseRepeatModeExtra(repeatModeExtra));
     }
     updateButtonVisibility();
     return true;