diff --git a/demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt
index be7c324e36..9abfd65056 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt
@@ -27,6 +27,7 @@ import android.widget.ArrayAdapter
 import android.widget.ListView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.media3.common.MediaItem
 import androidx.media3.session.LibraryResult
 import androidx.media3.session.MediaBrowser
@@ -164,7 +165,7 @@ class MainActivity : AppCompatActivity() {
         val root: MediaItem = result.value!!
         pushPathStack(root)
       },
-      MoreExecutors.directExecutor()
+      ContextCompat.getMainExecutor(this)
     )
   }
 
diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt
index f1c1631d45..125b0e0b8a 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt
@@ -29,6 +29,7 @@ import android.widget.LinearLayout
 import android.widget.ListView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
 import androidx.media3.session.MediaBrowser
@@ -150,7 +151,7 @@ class PlayableFolderActivity : AppCompatActivity() {
         val result = mediaItemFuture.get()!!
         title.text = result.value!!.mediaMetadata.title
       },
-      MoreExecutors.directExecutor()
+      ContextCompat.getMainExecutor(this)
     )
     childrenFuture.addListener(
       {
@@ -161,7 +162,7 @@ class PlayableFolderActivity : AppCompatActivity() {
         subItemMediaList.addAll(children)
         mediaListAdapter.notifyDataSetChanged()
       },
-      MoreExecutors.directExecutor()
+      ContextCompat.getMainExecutor(this)
     )
   }