diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5c4bccbdd4..4376c47a81 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -6,6 +6,12 @@
     *   FMP4: Fix issue where emsg sample metadata could be output in the wrong
         order for streams containing both v0 and v1 emsg atoms
         ([#9996](https://github.com/google/ExoPlayer/issues/9996)).
+*   Text:
+    *   Fix the interaction of `SingleSampleMediaSource.Factory.setTrackId` and
+        `MediaItem.SubtitleConfiguration.Builder.setId` to prioritise the
+        `SubtitleConfiguration` field and fall back to the `Factory` value if
+        it's not set
+        ([#10016](https://github.com/google/ExoPlayer/issues/10016)).
 
 ### 2.17.0 (2022-02-24)
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
index af72496e5e..ef9e8b7eb5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
@@ -72,11 +72,12 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
     }
 
     /**
-     * Sets an optional track id to be used.
-     *
-     * @param trackId An optional track id.
-     * @return This factory, for convenience.
+     * @deprecated Use {@link MediaItem.SubtitleConfiguration.Builder#setId(String)} instead (on the
+     *     {@link MediaItem.SubtitleConfiguration} passed to {@link
+     *     #createMediaSource(MediaItem.SubtitleConfiguration, long)}). {@code trackId} will only be
+     *     used if {@link MediaItem.SubtitleConfiguration#id} is {@code null}.
      */
+    @Deprecated
     public Factory setTrackId(@Nullable String trackId) {
       this.trackId = trackId;
       return this;
@@ -155,29 +156,28 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
     this.durationUs = durationUs;
     this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
     this.treatLoadErrorsAsEndOfStream = treatLoadErrorsAsEndOfStream;
-    mediaItem =
+    this.mediaItem =
         new MediaItem.Builder()
             .setUri(Uri.EMPTY)
             .setMediaId(subtitleConfiguration.uri.toString())
             .setSubtitleConfigurations(ImmutableList.of(subtitleConfiguration))
             .setTag(tag)
             .build();
-    format =
+    this.format =
         new Format.Builder()
-            .setId(trackId)
             .setSampleMimeType(firstNonNull(subtitleConfiguration.mimeType, MimeTypes.TEXT_UNKNOWN))
             .setLanguage(subtitleConfiguration.language)
             .setSelectionFlags(subtitleConfiguration.selectionFlags)
             .setRoleFlags(subtitleConfiguration.roleFlags)
             .setLabel(subtitleConfiguration.label)
-            .setId(subtitleConfiguration.id)
+            .setId(subtitleConfiguration.id != null ? subtitleConfiguration.id : trackId)
             .build();
-    dataSpec =
+    this.dataSpec =
         new DataSpec.Builder()
             .setUri(subtitleConfiguration.uri)
             .setFlags(DataSpec.FLAG_ALLOW_GZIP)
             .build();
-    timeline =
+    this.timeline =
         new SinglePeriodTimeline(
             durationUs,
             /* isSeekable= */ true,