diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74d7618e06a8e093cd57cae1861368c98a966064..d0fa950539dcd5eb0dd6b4f3b523436c484334b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ Note that since we don't clearly distinguish between a public and private interf
 
 ## [Unreleased]
 
+- Fix missing ``super.componentWillUnmount()`` calls (@simeonborko)
+
 ## [v3.9.0] - 2022-05-30
 
 - Improve picking by using drawbuffers (when available) to reduce number of drawcalls
diff --git a/src/extensions/geo-export/ui.tsx b/src/extensions/geo-export/ui.tsx
index 45461b77abdeb470b2691050752f0caaaec0bc4e..837c59021f5fb38fa342a315846ccd3eb8277466 100644
--- a/src/extensions/geo-export/ui.tsx
+++ b/src/extensions/geo-export/ui.tsx
@@ -71,6 +71,7 @@ export class GeometryExporterUI extends CollapsableControls<{}, State> {
     }
 
     componentWillUnmount() {
+        super.componentWillUnmount();
         this._controls?.dispose();
         this._controls = void 0;
     }
diff --git a/src/extensions/mp4-export/ui.tsx b/src/extensions/mp4-export/ui.tsx
index 0dbcd35c4c0200434616e520e845373e0260374a..910a1b49819e4365811f530efbcd182fcf1023e0 100644
--- a/src/extensions/mp4-export/ui.tsx
+++ b/src/extensions/mp4-export/ui.tsx
@@ -102,6 +102,7 @@ export class Mp4EncoderUI extends CollapsableControls<{}, State> {
     }
 
     componentWillUnmount() {
+        super.componentWillUnmount();
         this._controls?.dispose();
         this._controls = void 0;
     }
diff --git a/src/mol-plugin-ui/state/snapshots.tsx b/src/mol-plugin-ui/state/snapshots.tsx
index 540c17a8df5527c79d825881870ca22c8d8a019a..6d8757b3723dfec52592827073e3adfac16dbb97 100644
--- a/src/mol-plugin-ui/state/snapshots.tsx
+++ b/src/mol-plugin-ui/state/snapshots.tsx
@@ -215,6 +215,7 @@ export class RemoteStateSnapshots extends PluginUIComponent<
     }
 
     componentWillUnmount() {
+        super.componentWillUnmount();
         this._mounted = false;
     }