diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/MetadataTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/metadata/MetadataTrackRenderer.java
index 38db32746b..6376f88a61 100644
--- a/library/src/main/java/com/google/android/exoplayer/metadata/MetadataTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/metadata/MetadataTrackRenderer.java
@@ -131,7 +131,9 @@ public class MetadataTrackRenderer<T> extends TrackRenderer implements Callback
     try {
       source.continueBuffering(trackIndex, positionUs);
     } catch (IOException e) {
-      throw new ExoPlaybackException(e);
+      // TODO: This should be propagated, but in the current design propagation may occur too
+      // early. See [Internal b/22291244].
+      // throw new ExoPlaybackException(e);
     }
 
     if (!inputStreamEnded && pendingMetadata == null) {
diff --git a/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608TrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608TrackRenderer.java
index 3dd37ab51a..45bf83694c 100644
--- a/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608TrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608TrackRenderer.java
@@ -136,7 +136,9 @@ public class Eia608TrackRenderer extends TrackRenderer implements Callback {
     try {
       source.continueBuffering(trackIndex, positionUs);
     } catch (IOException e) {
-      throw new ExoPlaybackException(e);
+      // TODO: This should be propagated, but in the current design propagation may occur too
+      // early. See [Internal b/22291244].
+      // throw new ExoPlaybackException(e);
     }
 
     if (isSamplePending()) {