diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 05e70921ae..158b14e2e4 100644
--- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -821,6 +821,8 @@ import java.io.IOException;
         // Release all loaded periods and seek to the new playing period index.
         releasePeriodsFrom(playingPeriod);
         playingPeriod = null;
+        readingPeriod = null;
+        loadingPeriod = null;
 
         MediaSource.Position defaultStartPosition =
             mediaSource.getDefaultStartPosition(newPlayingPeriodIndex);
@@ -851,6 +853,8 @@ import java.io.IOException;
             index = playingPeriod.index;
             releasePeriodsFrom(playingPeriod);
             playingPeriod = null;
+            readingPeriod = null;
+            loadingPeriod = null;
             seekToPeriodPosition(index, 0);
             return;
           }
diff --git a/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
index acda232262..67645925d6 100644
--- a/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
+++ b/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
@@ -135,7 +135,7 @@ public final class ExtractorMediaSource implements MediaSource, MediaSource.List
   @Override
   public void prepareSource(MediaSource.Listener listener) {
     sourceListener = listener;
-    timeline = new SinglePeriodTimeline(this, C.UNSET_TIME_US, false);
+    timeline = new SinglePeriodTimeline(0, C.UNSET_TIME_US, false);
     listener.onSourceInfoRefreshed(timeline, null);
   }