diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java
index 41ae7d471b..9f8cce4373 100644
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java
@@ -153,7 +153,7 @@ public final class DefaultHlsPlaylistTracker
           new CmcdData.Factory(cmcdConfiguration, CmcdData.STREAMING_FORMAT_HLS)
               .setObjectType(CmcdData.OBJECT_TYPE_MANIFEST)
               .createCmcdData();
-      cmcdData.addToDataSpec(dataSpec);
+      dataSpec = cmcdData.addToDataSpec(dataSpec);
     }
     ParsingLoadable<HlsPlaylist> multivariantPlaylistLoadable =
         new ParsingLoadable<>(
@@ -796,7 +796,7 @@ public final class DefaultHlsPlaylistTracker
         if (primaryMediaPlaylistSnapshot != null) {
           cmcdDataFactory.setIsLive(!primaryMediaPlaylistSnapshot.hasEndTag);
         }
-        cmcdDataFactory.createCmcdData().addToDataSpec(dataSpec);
+        dataSpec = cmcdDataFactory.createCmcdData().addToDataSpec(dataSpec);
       }
       ParsingLoadable<HlsPlaylist> mediaPlaylistLoadable =
           new ParsingLoadable<>(
diff --git a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java
index 3ff6aafd8e..e380f18c04 100644
--- a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java
+++ b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java
@@ -689,7 +689,7 @@ public final class SsMediaSource extends BaseMediaSource
       if (manifest != null) {
         cmcdDataFactory.setIsLive(manifest.isLive);
       }
-      cmcdDataFactory.createCmcdData().addToDataSpec(dataSpec);
+      dataSpec = cmcdDataFactory.createCmcdData().addToDataSpec(dataSpec);
     }
     ParsingLoadable<SsManifest> loadable =
         new ParsingLoadable<>(manifestDataSource, dataSpec, C.DATA_TYPE_MANIFEST, manifestParser);