shaka-project
diff --git a/‎lib/media/media_source_engine.js‎
Lines changed: 2 additions & 2 deletions b/‎lib/media/media_source_engine.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎lib/text/text_engine.js‎
Lines changed: 5 additions & 2 deletions b/‎lib/text/text_engine.js‎
Lines changed: 5 additions & 2 deletions
@@ -1383,7 +1383,7 @@ shaka.media.MediaSourceEngine = class {
       // Get actual TextEngine buffer start, as it's not the same as video
       // buffer and TextEngine does not support multiple buffered ranges.
       const textStart = this.textEngine_.bufferStart() || 0;
-      this.textEngine_.remove(textStart, endTime);
+      this.textEngine_.remove(textStart, endTime, /* removeCC= */ true);
     }
     if (contentType == ContentType.TEXT) {
       await this.textEngine_.remove(startTime, endTime);
@@ -1418,7 +1418,7 @@ shaka.media.MediaSourceEngine = class {
       // if we have CEA captions, we should clear those too.
       if (contentType === ContentType.VIDEO && this.captionParser_ &&
           this.textEngine_) {
-        await this.textEngine_.remove(0, Infinity);
+        await this.textEngine_.remove(0, Infinity, /* removeCC= */ true);
       }
       // Note that not all platforms allow clearing to Infinity.
       await this.enqueueOperation_(
 
@@ -242,15 +242,18 @@ shaka.text.TextEngine = class {
   /**
    * @param {number} startTime relative to the start of the presentation
    * @param {number} endTime relative to the start of the presentation
+   * @param {boolean=} removeClosedCaptions
    * @return {!Promise}
    */
-  async remove(startTime, endTime) {
+  async remove(startTime, endTime, removeClosedCaptions = false) {
     // Start the operation asynchronously to avoid blocking the caller.
     await Promise.resolve();
     if (startTime >= endTime) {
       return;
     }
-    this.removeClosedCaptions_(startTime, endTime);
+    if (removeClosedCaptions) {
+      this.removeClosedCaptions_(startTime, endTime);
+    }
     if (this.displayer_ && this.displayer_.remove(startTime, endTime)) {
       if (this.bufferStart_ == null) {
         goog.asserts.assert(