diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
index 6e66049d13..647678bc00 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -2139,6 +2139,7 @@ public class MatroskaExtractor implements Extractor {
       Format format =
           formatBuilder
               .setId(trackId)
+              .setLabel(name)
               .setSampleMimeType(mimeType)
               .setMaxInputSize(maxInputSize)
               .setLanguage(language)
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
index a3d20eadb7..c68159eaf9 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
@@ -48,6 +48,11 @@ public class DefaultTrackNameProvider implements TrackNameProvider {
               buildLanguageOrLabelString(format),
               buildAudioChannelString(format),
               buildBitrateString(format));
+    } else if (trackType == C.TRACK_TYPE_TEXT) {
+      trackName =
+          joinWithSeparator(
+              buildLabelString(format),
+              buildLanguageString(format));
     } else {
       trackName = buildLanguageOrLabelString(format);
     }