diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Playlist.java b/library/core/src/main/java/com/google/android/exoplayer2/Playlist.java
index 94fa88464c..179c70538d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Playlist.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Playlist.java
@@ -248,7 +248,8 @@ import java.util.Set;
    * @param analyticsCollector The analytics collector.
    */
   public final void setAnalyticsCollector(Handler handler, AnalyticsCollector analyticsCollector) {
-    eventDispatcher.addEventListener(handler, analyticsCollector);
+    eventDispatcher.addEventListener(handler, analyticsCollector, MediaSourceEventListener.class);
+    eventDispatcher.addEventListener(handler, analyticsCollector, DrmSessionEventListener.class);
   }
 
   /**