diff --git a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
index a5a1f2d770ed3..26980701c7a4f 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
@@ -114,8 +114,8 @@ class Row extends React.PureComponent {
   }
 
   componentWillUnmount() {
-    this.observerEnabler.disconnect();
-    this.observerDisabler.disconnect();
+    this.observerEnabler?.disconnect();
+    this.observerDisabler?.disconnect();
   }
 
   handleChangeFocus(nextFocus) {