diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java
index c27b9d15f9..a92a566ad5 100644
--- a/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java
+++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java
@@ -146,6 +146,16 @@ public class SpannedToHtmlConverterTest {
     assertThat(html).isEqualTo("String with <i>&lt;foo&gt;unrecognised&lt;/foo&gt;</i> tags");
   }
 
+  @Test
+  public void convert_convertsNonAsciiCharactersToAmpersandCodes() {
+    String html =
+        SpannedToHtmlConverter.convert(
+            new SpannableString("Strìng with 優しいの non-ASCII characters"));
+
+    assertThat(html)
+        .isEqualTo("Str&#236;ng with &#20778;&#12375;&#12356;&#12398; non-ASCII characters");
+  }
+
   @Test
   public void convert_ignoresUnrecognisedSpan() {
     SpannableString spanned = new SpannableString("String with unrecognised span");