diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java b/libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java
index 82e497c537..8093161bd8 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java
@@ -392,7 +392,9 @@ import java.util.concurrent.TimeoutException;
 
     @Override
     public void onDisconnected(MediaController controller) {
-      mediaSessionService.removeSession(session);
+      if (mediaSessionService.isSessionAdded(session)) {
+        mediaSessionService.removeSession(session);
+      }
       // We may need to hide the notification.
       mediaSessionService.onUpdateNotificationInternal(
           session, /* startInForegroundWhenPaused= */ false);