diff --git a/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 5eda502da5..9d05500dd6 100644
--- a/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -456,6 +456,7 @@ public final class SimpleExoPlayer implements ExoPlayer {
   @Override
   public void release() {
     player.release();
+    removeSurfaceCallbacks();
   }
 
   @Override