diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java b/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
index 8d59a263d7ed1..c4b07e8108deb 100644
--- a/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
+++ b/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
@@ -711,6 +711,10 @@ private void flushAllViews() {
     while (platformViews.size() > 0) {
       channelHandler.disposeAndroidViewForPlatformView(platformViews.keyAt(0));
     }
+
+    if (contextToPlatformView.size() > 0) {
+      contextToPlatformView.clear();
+    }
   }
 
   private void initializeRootImageViewIfNeeded() {