diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java b/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java
index 8151ddb578..89b6271883 100644
--- a/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java
+++ b/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java
@@ -468,7 +468,6 @@ import java.util.ArrayList;
         return;
       }
 
-      setState(ExoPlayer.STATE_BUFFERING);
       stopRenderers();
       rebuffering = false;
 
@@ -483,6 +482,7 @@ import java.util.ArrayList;
 
       updatePlaybackPositions();
       if (sampleSourceProvider != null) {
+        setState(ExoPlayer.STATE_BUFFERING);
         handler.sendEmptyMessage(MSG_DO_SOME_WORK);
       }
     } finally {