diff --git a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
index c59290fbe9af7..a5a1f2d770ed3 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
@@ -114,11 +114,8 @@ class Row extends React.PureComponent {
   }
 
   componentWillUnmount() {
-    const element = this.containerRef.current;
-    if (element) {
-      this.observerEnabler.unobserve(element);
-      this.observerDisabler.unobserve(element);
-    }
+    this.observerEnabler.disconnect();
+    this.observerDisabler.disconnect();
   }
 
   handleChangeFocus(nextFocus) {