diff --git a/library/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index 6bf7b6a944..05324e29fe 100644
--- a/library/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -409,7 +409,7 @@ public final class Cea608Decoder extends CeaDecoder {
     // underline toggle
     boolean nextRowDown = (cc2 & 0x20) != 0;
     if (row != currentCueBuilder.getRow() || nextRowDown) {
-      if (!currentCueBuilder.isEmpty()) {
+      if (captionMode != CC_MODE_ROLL_UP && !currentCueBuilder.isEmpty()) {
         currentCueBuilder = new CueBuilder(captionMode, captionRowCount);
         cueBuilders.add(currentCueBuilder);
       }
@@ -755,6 +755,11 @@ public final class Cea608Decoder extends CeaDecoder {
           TYPE_UNSET, 0.8f);
     }
 
+    @Override
+    public String toString() {
+      return captionStringBuilder.toString();
+    }
+
     private static class CueStyle {
 
       public final CharacterStyle style;