diff --git a/lib/media/streaming_engine.js b/lib/media/streaming_engine.js
index 20a39fe040..530a9aeeb5 100644
--- a/lib/media/streaming_engine.js
+++ b/lib/media/streaming_engine.js
@@ -2697,6 +2697,9 @@ shaka.media.StreamingEngine = class {
    * @private
    */
   async evict_(mediaState, presentationTime) {
+    if (this.lastTextMediaStateBeforeUnload_ == mediaState) {
+      this.lastTextMediaStateBeforeUnload_ = null;
+    }
     const segmentIndex = mediaState.stream.segmentIndex;
     /** @type {Array<number>} */
     let continuityTimelines;
@@ -2723,9 +2726,6 @@ shaka.media.StreamingEngine = class {
     const startTime =
         this.playerInterface_.mediaSourceEngine.bufferStart(mediaState.type);
     if (startTime == null) {
-      if (this.lastTextMediaStateBeforeUnload_ == mediaState) {
-        this.lastTextMediaStateBeforeUnload_ = null;
-      }
       shaka.log.v2(logPrefix,
           'buffer behind okay because nothing buffered:',
           'presentationTime=' + presentationTime,