diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index d234cc2d60..2418b53469 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -801,8 +801,6 @@ import java.util.Map;
           sampleQueueTrackIds[sampleQueueIndex] = id;
           return sampleQueues[sampleQueueIndex];
         }
-      } else if (tracksEnded) {
-        return createDummyTrackOutput(id, type);
       }
     } else /* sparse track */ {
       for (int i = 0; i < trackCount; i++) {
@@ -810,9 +808,9 @@ import java.util.Map;
           return sampleQueues[i];
         }
       }
-      if (tracksEnded) {
-        return createDummyTrackOutput(id, type);
-      }
+    }
+    if (tracksEnded) {
+      return createDummyTrackOutput(id, type);
     }
     SampleQueue trackOutput = new PrivTimestampStrippingSampleQueue(allocator);
     trackOutput.setSampleOffsetUs(sampleOffsetUs);