diff --git a/demos/shortform/src/main/java/androidx/media3/demo/shortform/MediaItemDatabase.kt b/demos/shortform/src/main/java/androidx/media3/demo/shortform/MediaItemDatabase.kt
index 486f69c81d..04d4170b9a 100644
--- a/demos/shortform/src/main/java/androidx/media3/demo/shortform/MediaItemDatabase.kt
+++ b/demos/shortform/src/main/java/androidx/media3/demo/shortform/MediaItemDatabase.kt
@@ -16,9 +16,7 @@
 package androidx.media3.demo.shortform
 
 import androidx.media3.common.MediaItem
-import androidx.media3.common.util.UnstableApi
 
-@UnstableApi
 class MediaItemDatabase {
 
   private val mediaUris =
diff --git a/demos/shortform/src/main/java/androidx/media3/demo/shortform/viewpager/ViewPagerActivity.kt b/demos/shortform/src/main/java/androidx/media3/demo/shortform/viewpager/ViewPagerActivity.kt
index 2ed9b2925c..8ac71dddd7 100644
--- a/demos/shortform/src/main/java/androidx/media3/demo/shortform/viewpager/ViewPagerActivity.kt
+++ b/demos/shortform/src/main/java/androidx/media3/demo/shortform/viewpager/ViewPagerActivity.kt
@@ -18,13 +18,11 @@ package androidx.media3.demo.shortform.viewpager
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-import androidx.media3.common.util.UnstableApi
 import androidx.media3.demo.shortform.MainActivity
 import androidx.media3.demo.shortform.MediaItemDatabase
 import androidx.media3.demo.shortform.R
 import androidx.viewpager2.widget.ViewPager2
 
-@UnstableApi
 class ViewPagerActivity : AppCompatActivity() {
   private lateinit var viewPagerView: ViewPager2
   private lateinit var adapter: ViewPagerMediaAdapter
diff --git a/demos/shortform/src/main/java/androidx/media3/demo/shortform/viewpager/ViewPagerMediaAdapter.kt b/demos/shortform/src/main/java/androidx/media3/demo/shortform/viewpager/ViewPagerMediaAdapter.kt
index 97438f9480..ed18fe75b9 100644
--- a/demos/shortform/src/main/java/androidx/media3/demo/shortform/viewpager/ViewPagerMediaAdapter.kt
+++ b/demos/shortform/src/main/java/androidx/media3/demo/shortform/viewpager/ViewPagerMediaAdapter.kt
@@ -20,6 +20,7 @@ import android.os.HandlerThread
 import android.os.Process
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.annotation.OptIn
 import androidx.media3.common.C
 import androidx.media3.common.MediaItem
 import androidx.media3.common.util.Log
@@ -39,7 +40,7 @@ import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter
 import androidx.recyclerview.widget.RecyclerView
 import kotlin.math.abs
 
-@UnstableApi
+@OptIn(UnstableApi::class)
 class ViewPagerMediaAdapter(
   private val mediaItemDatabase: MediaItemDatabase,
   numberOfPlayers: Int,