diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index de07aecfb67..31f21e4c576 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -11,6 +11,8 @@
 *   IMA extension:
     *   Upgrade IMA SDK dependency to 3.21.0, and release the `AdsLoader`
         ([#7344](https://github.com/google/ExoPlayer/issues/7344)).
+    *   Improve handling of ad tags with unsupported VPAID ads
+        ([#7832](https://github.com/google/ExoPlayer/issues/7832)).
 
 ### 2.12.1 (2020-10-23) ###
 
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 c72650cf5ce..e7a82534516 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
@@ -1212,11 +1212,24 @@ private void resumeContentInternal() {
     if (imaAdInfo != null) {
       adPlaybackState = adPlaybackState.withSkippedAdGroup(imaAdInfo.adGroupIndex);
       updateAdPlaybackState();
-    } else if (adPlaybackState.adGroupCount == 1 && adPlaybackState.adGroupTimesUs[0] == 0) {
-      // For incompatible VPAID ads with one preroll, content is resumed immediately. In this case
-      // we haven't received ad info (the ad never loaded), but there is only one ad group to skip.
-      adPlaybackState = adPlaybackState.withSkippedAdGroup(/* adGroupIndex= */ 0);
-      updateAdPlaybackState();
+    } else {
+      // Mark any ads for the current/reported player position that haven't loaded as being in the
+      // error state, to force resuming content. This includes VPAID ads that never load.
+      long playerPositionUs;
+      if (player != null) {
+        playerPositionUs = C.msToUs(getContentPeriodPositionMs(player, timeline, period));
+      } else if (!VideoProgressUpdate.VIDEO_TIME_NOT_READY.equals(lastContentProgress)) {
+        // Playback is backgrounded so use the last reported content position.
+        playerPositionUs = C.msToUs(lastContentProgress.getCurrentTimeMs());
+      } else {
+        return;
+      }
+      int adGroupIndex =
+          adPlaybackState.getAdGroupIndexForPositionUs(
+              playerPositionUs, C.msToUs(contentDurationMs));
+      if (adGroupIndex != C.INDEX_UNSET) {
+        markAdGroupInErrorStateAndClearPendingContentPosition(adGroupIndex);
+      }
     }
   }