diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
index 50eaaa02e3..12f5952dd0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -154,23 +154,24 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
   @Override
   public void updateSelectedTrack(long bufferedDurationUs) {
     long nowMs = SystemClock.elapsedRealtime();
-    // Get the current and ideal selections.
+    // Stash the current selection, then make a new one.
     int currentSelectedIndex = selectedIndex;
-    int idealSelectedIndex = determineIdealSelectedIndex(nowMs);
-    // Assume we can switch to the ideal selection.
-    selectedIndex = idealSelectedIndex;
-    // Revert back to the current selection if conditions are not suitable for switching.
+    selectedIndex = determineIdealSelectedIndex(nowMs);
+    if (selectedIndex == currentSelectedIndex) {
+      return;
+    }
     if (!isBlacklisted(currentSelectedIndex, nowMs)) {
+      // Revert back to the current selection if conditions are not suitable for switching.
       Format currentFormat = getFormat(currentSelectedIndex);
-      Format idealFormat = getFormat(idealSelectedIndex);
-      if (idealFormat.bitrate > currentFormat.bitrate
+      Format selectedFormat = getFormat(selectedIndex);
+      if (selectedFormat.bitrate > currentFormat.bitrate
           && bufferedDurationUs < minDurationForQualityIncreaseUs) {
-        // The ideal track is a higher quality, but we have insufficient buffer to safely switch
+        // The selected track is a higher quality, but we have insufficient buffer to safely switch
         // up. Defer switching up for now.
         selectedIndex = currentSelectedIndex;
-      } else if (idealFormat.bitrate < currentFormat.bitrate
+      } else if (selectedFormat.bitrate < currentFormat.bitrate
           && bufferedDurationUs >= maxDurationForQualityDecreaseUs) {
-        // The ideal track is a lower quality, but we have sufficient buffer to defer switching
+        // The selected track is a lower quality, but we have sufficient buffer to defer switching
         // down for now.
         selectedIndex = currentSelectedIndex;
       }