diff --git a/packages/flutter/lib/src/widgets/overlay.dart b/packages/flutter/lib/src/widgets/overlay.dart
index dc2207af430..a223eaf6c3a 100644
--- a/packages/flutter/lib/src/widgets/overlay.dart
+++ b/packages/flutter/lib/src/widgets/overlay.dart
@@ -215,9 +215,9 @@ class OverlayState extends State<Overlay> {
   }
 
   void _remove(OverlayEntry entry) {
-    setState(() {
-      _entries.remove(entry);
-    });
+    _entries.remove(entry);
+    if (mounted)
+      setState(() { /* entry was removed */ });
   }
 
   /// (DEBUG ONLY) Check whether a given entry is visible (i.e., not behind an opaque entry).