diff --git a/app/scripts/components/common/map/controls/hooks/use-themed-control.tsx b/app/scripts/components/common/map/controls/hooks/use-themed-control.tsx
index ff50f88a6..40149bc2e 100644
--- a/app/scripts/components/common/map/controls/hooks/use-themed-control.tsx
+++ b/app/scripts/components/common/map/controls/hooks/use-themed-control.tsx
@@ -49,6 +49,10 @@ export default function useThemedControl(
         <ThemeProvider theme={theme}>{renderFn() as any}</ThemeProvider>
       );
     }
+    return () => {
+      rootRef.current?.unmount();
+      rootRef.current = null;
+    };
   }, [renderFn, theme]);
 
   useControl(() => new ThemedControl(), opts);