2 files changed, 3 insertions, 0 deletions
diff --git a/webapp/components/needs_team.jsx b/webapp/components/needs_team.jsx
index 6c023d497..cd80f0fc7 100644
--- a/webapp/components/needs_team.jsx
+++ b/webapp/components/needs_team.jsx
@@ -94,6 +94,7 @@ export default class NeedsTeam extends React.Component {
 
         $(window).on('blur', () => {
             window.isActive = false;
+            AsyncClient.setActiveChannel('');
         });
 
         Utils.applyTheme(this.state.theme);
diff --git a/webapp/components/post_view/post_view_cache.jsx b/webapp/components/post_view/post_view_cache.jsx
index 8876ae461..13ce79d7f 100644
--- a/webapp/components/post_view/post_view_cache.jsx
+++ b/webapp/components/post_view/post_view_cache.jsx
@@ -4,6 +4,7 @@
 import PostViewController from './post_view_controller.jsx';
 
 import ChannelStore from 'stores/channel_store.jsx';
+import * as AsyncClient from 'utils/async_client.jsx';
 
 import React from 'react';
 
@@ -28,6 +29,7 @@ export default class PostViewCache extends React.Component {
     }
 
     componentWillUnmount() {
+        AsyncClient.setActiveChannel('');
         ChannelStore.removeChangeListener(this.onChannelChange);
     }