diff --git a/grafana-plugin/src/pages/settings/tabs/ChatOps/ChatOps.tsx b/grafana-plugin/src/pages/settings/tabs/ChatOps/ChatOps.tsx
index 8725325b..fbe4f886 100644
--- a/grafana-plugin/src/pages/settings/tabs/ChatOps/ChatOps.tsx
+++ b/grafana-plugin/src/pages/settings/tabs/ChatOps/ChatOps.tsx
@@ -33,7 +33,11 @@ class ChatOpsPage extends React.Component<AppRootProps, ChatOpsState> {
   componentDidMount() {
     const { query } = this.props;
 
-    this.handleChatopsTabChange(query.tab || ChatOpsTab.Slack);
+    this.handleChatopsTabChange(query?.tab || ChatOpsTab.Slack);
+  }
+
+  componentWillUnmount() {
+    this.handleChatopsTabChange(undefined);
   }
 
   render() {