diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 544644d03b..26e0d0e006 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -674,12 +674,8 @@ public final class MediaSessionConnector {
         // active queue item and queue navigation actions may need to be updated
         updateMediaSessionPlaybackState();
       }
-      if (currentWindowCount != windowCount) {
-        // active queue item and queue navigation actions may need to be updated
-        updateMediaSessionPlaybackState();
-      }
       currentWindowCount = windowCount;
-      currentWindowIndex = player.getCurrentWindowIndex();
+      currentWindowIndex = windowIndex;
       updateMediaSessionMetadata();
     }