diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index cb745018be..b4e877f5dc 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -19,6 +19,8 @@
         on seeking to another position
         ([#7492](https://github.com/google/ExoPlayer/issues/7492)).
     *   Fix incorrect rounding of ad cue points.
+    *   Fix handling of postrolls preloading
+        ([#7518](https://github.com/google/ExoPlayer/issues/7518)).
 
 ### 2.11.5 (2020-06-05) ###
 
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index b8d8203f77..eecce40314 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -1089,11 +1089,19 @@ public final class ImaAdsLoader implements Player.EventListener, AdsLoader {
     }
     if (!sentContentComplete && !wasPlayingAd && playingAd && imaAdState == IMA_AD_STATE_NONE) {
       int adGroupIndex = player.getCurrentAdGroupIndex();
-      // IMA hasn't called playAd yet, so fake the content position.
-      fakeContentProgressElapsedRealtimeMs = SystemClock.elapsedRealtime();
-      fakeContentProgressOffsetMs = C.usToMs(adPlaybackState.adGroupTimesUs[adGroupIndex]);
-      if (fakeContentProgressOffsetMs == C.TIME_END_OF_SOURCE) {
-        fakeContentProgressOffsetMs = contentDurationMs;
+      if (adPlaybackState.adGroupTimesUs[adGroupIndex] == C.TIME_END_OF_SOURCE) {
+        adsLoader.contentComplete();
+        if (DEBUG) {
+          Log.d(TAG, "adsLoader.contentComplete from period transition");
+        }
+        sentContentComplete = true;
+      } else {
+        // IMA hasn't called playAd yet, so fake the content position.
+        fakeContentProgressElapsedRealtimeMs = SystemClock.elapsedRealtime();
+        fakeContentProgressOffsetMs = C.usToMs(adPlaybackState.adGroupTimesUs[adGroupIndex]);
+        if (fakeContentProgressOffsetMs == C.TIME_END_OF_SOURCE) {
+          fakeContentProgressOffsetMs = contentDurationMs;
+        }
       }
     }
   }
@@ -1212,7 +1220,7 @@ public final class ImaAdsLoader implements Player.EventListener, AdsLoader {
         && positionMs + THRESHOLD_END_OF_CONTENT_MS >= contentDurationMs) {
       adsLoader.contentComplete();
       if (DEBUG) {
-        Log.d(TAG, "adsLoader.contentComplete");
+        Log.d(TAG, "adsLoader.contentComplete from content position check");
       }
       sentContentComplete = true;
     }