diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index ab99994267..b89bd6fc54 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -608,16 +608,14 @@ public class SimpleExoPlayer extends BasePlayer
   @Override
   public void setOutputBufferRenderer(VideoDecoderOutputBufferRenderer outputBufferRenderer) {
     verifyApplicationThread();
-    removeSurfaceCallbacks();
-    List<PlayerMessage> messages = new ArrayList<>();
+    setVideoSurface(null);
     for (Renderer renderer : renderers) {
       if (renderer.getTrackType() == C.TRACK_TYPE_VIDEO) {
-        messages.add(
-            player
-                .createMessage(renderer)
-                .setType(C.MSG_SET_OUTPUT_BUFFER_RENDERER)
-                .setPayload(outputBufferRenderer)
-                .send());
+        player
+            .createMessage(renderer)
+            .setType(C.MSG_SET_OUTPUT_BUFFER_RENDERER)
+            .setPayload(outputBufferRenderer)
+            .send();
       }
     }
   }