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 cc8291c27d..16ca1a25a5 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
@@ -72,6 +72,12 @@ class PlaybackService : MediaLibraryService() {
     return mediaLibrarySession
   }
 
+  override fun onTaskRemoved(rootIntent: Intent?) {
+    if (!player.playWhenReady) {
+      stopSelf()
+    }
+  }
+
   override fun onDestroy() {
     player.release()
     mediaLibrarySession.release()