diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index a72ac33206..74b6e19d94 100644
--- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -693,7 +693,7 @@ import java.util.ArrayList;
 
         Period previousPeriod = playingPeriod;
         boolean seenReadingPeriod = false;
-        while (previousPeriod != null) {
+        while (previousPeriod.nextPeriod != null) {
           Period period = previousPeriod.nextPeriod;
           index++;
           if (!period.id.equals(timeline.getPeriodId(index))) {