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 f765902f842..6683b48bd72 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
@@ -62,7 +62,13 @@ public String getTrackName(Format format) {
     } else {
       trackName = buildLanguageOrLabelString(format);
     }
-    return trackName.length() == 0 ? resources.getString(R.string.exo_track_unknown) : trackName;
+    if (trackName.length() != 0) {
+      return trackName;
+    }
+    @Nullable String language = format.language;
+    return (language == null || language.trim().isEmpty())
+        ? resources.getString(R.string.exo_track_unknown)
+        : resources.getString(R.string.exo_track_unknown_name, language);
   }
 
   private String buildResolutionString(Format format) {
diff --git a/library/ui/src/main/res/values/strings.xml b/library/ui/src/main/res/values/strings.xml
index 6049b017674..3754f50abd8 100644
--- a/library/ui/src/main/res/values/strings.xml
+++ b/library/ui/src/main/res/values/strings.xml
@@ -100,6 +100,8 @@
   <string name="exo_track_selection_auto">Auto</string>
   <!-- Name of a media track about which nothing is known. Shown in a list view that allows the user to choose between multiple media tracks. [CHAR LIMIT=20] -->
   <string name="exo_track_unknown">Unknown</string>
+  <!-- Name of a media track of which the language name could not be identified. Shown in a list view that allows the user to choose between multiple media tracks. [CHAR LIMIT=20] -->
+  <string name="exo_track_unknown_name">Unknown (<xliff:g id="name" example="Frengligian">%1$s</xliff:g>)</string>
   <!-- Resolution of a video track. [CHAR LIMIT=20] -->
   <string name="exo_track_resolution"><xliff:g id="width" example="1024">%1$d</xliff:g> × <xliff:g id="height" example="768">%2$d</xliff:g></string>
   <!-- Describes an audio track with one channel. Shown in a list view that allows the user to choose between multiple audio tracks. [CHAR LIMIT=20] -->
diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/DefaultTrackNameProviderTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/DefaultTrackNameProviderTest.java
index a5ea81f2597..8c87406b290 100644
--- a/library/ui/src/test/java/com/google/android/exoplayer2/ui/DefaultTrackNameProviderTest.java
+++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/DefaultTrackNameProviderTest.java
@@ -29,13 +29,46 @@
 public class DefaultTrackNameProviderTest {
 
   @Test
-  public void getTrackName_handlesInvalidLanguage() {
+  public void getTrackName_withInvalidLanguage_returnsUnknownWithLanguage() {
     Resources resources = ApplicationProvider.getApplicationContext().getResources();
     DefaultTrackNameProvider provider = new DefaultTrackNameProvider(resources);
     Format format = new Format.Builder().setLanguage("```").build();
 
     String name = provider.getTrackName(format);
 
+    assertThat(name).isEqualTo(resources.getString(R.string.exo_track_unknown_name, "```"));
+  }
+
+  @Test
+  public void getTrackName_withLanguageEmptyString_returnsUnknown() {
+    Resources resources = ApplicationProvider.getApplicationContext().getResources();
+    DefaultTrackNameProvider provider = new DefaultTrackNameProvider(resources);
+    Format format = new Format.Builder().setLanguage("").build();
+
+    String name = provider.getTrackName(format);
+
     assertThat(name).isEqualTo(resources.getString(R.string.exo_track_unknown));
   }
+
+  @Test
+  public void getTrackName_withLanguageSpacesNewLine_returnsUnknown() {
+    Resources resources = ApplicationProvider.getApplicationContext().getResources();
+    DefaultTrackNameProvider provider = new DefaultTrackNameProvider(resources);
+    Format format = new Format.Builder().setLanguage("   \n ").build();
+
+    String name = provider.getTrackName(format);
+
+    assertThat(name).isEqualTo(resources.getString(R.string.exo_track_unknown));
+  }
+
+  @Test
+  public void getTrackName_withLanguageEmptyStringAndLabel_returnsLabel() {
+    Resources resources = ApplicationProvider.getApplicationContext().getResources();
+    DefaultTrackNameProvider provider = new DefaultTrackNameProvider(resources);
+    Format format = new Format.Builder().setLanguage("").setLabel("Main").build();
+
+    String name = provider.getTrackName(format);
+
+    assertThat(name).isEqualTo("Main");
+  }
 }