diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/player/DemoPlayer.java b/demo/src/main/java/com/google/android/exoplayer/demo/player/DemoPlayer.java
index 2ffce8d9b2..2a1a178cd5 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/player/DemoPlayer.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/player/DemoPlayer.java
@@ -447,6 +447,11 @@ public class DemoPlayer implements ExoPlayer.Listener, ChunkSampleSource.EventLi
     }
   }
 
+  @Override
+  public void onDrmKeysLoaded() {
+    // Do nothing.
+  }
+
   @Override
   public void onDrmSessionManagerError(Exception e) {
     if (internalErrorListener != null) {
diff --git a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
index 7064e2107b..6e42cea28d 100644
--- a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
+++ b/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
@@ -51,10 +51,9 @@ public class StreamingDrmSessionManager implements DrmSessionManager {
   public interface EventListener {
 
     /**
-     * Invoked when DRM keys have been loaded. Depending on license setup, this might occur multiple
-     * times during playback.
+     * Invoked each time keys are loaded.
      */
-    void onKeysLoaded();
+    void onDrmKeysLoaded();
 
     /**
      * Invoked when a drm error occurs.
@@ -396,7 +395,7 @@ public class StreamingDrmSessionManager implements DrmSessionManager {
         eventHandler.post(new Runnable() {
           @Override
           public void run() {
-            eventListener.onKeysLoaded();
+            eventListener.onDrmKeysLoaded();
           }
         });
       }