diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index 21bdaef0f3..76dbf40194 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -93,7 +93,12 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
 
   @Override
   public void onCurrentWindowIndexChanged(Player player) {
-    publishFloatingQueueWindow(player);
+    if (activeQueueItemId == MediaSessionCompat.QueueItem.UNKNOWN_ID
+        || player.getCurrentTimeline().getWindowCount() > maxQueueSize) {
+      publishFloatingQueueWindow(player);
+    } else if (!player.getCurrentTimeline().isEmpty()) {
+      activeQueueItemId = player.getCurrentWindowIndex();
+    }
   }
 
   @Override