diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 2bb1ffaa1..395ca8c3b 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -36,6 +36,21 @@ class Stream extends React.Component {
     if (!this.userIsDegraged(this.props) && this.userIsDegraged(next)) {
       this.setState({keepCommentBox: true});
     }
+
+    if (next.activeStreamTab !== 'all') {
+      const slotPlugins = this.getSlotComponents('streamTabs', next).map((c) => c.talkPluginName);
+      if (slotPlugins.indexOf(next.activeStreamTab) === -1) {
+        next.setActiveStreamTab('all');
+      }
+    }
+  }
+
+  getSlotProps({data, root, root: {asset}} = this.props) {
+    return {data, root, asset};
+  }
+
+  getSlotComponents(slot, props = this.props) {
+    return getSlotComponents(slot, props.reduxState, this.getSlotProps(props));
   }
 
   setActiveReplyBox = (id) => {
@@ -74,7 +89,6 @@ class Stream extends React.Component {
       loadMoreComments,
       viewAllComments,
       auth: {loggedIn, user},
-      reduxState,
       editName
     } = this.props;
     const {keepCommentBox} = this.state;
@@ -98,7 +112,7 @@ class Stream extends React.Component {
     };
 
     const showCommentBox = loggedIn && ((!banned && !temporarilySuspended && !highlightedComment) || keepCommentBox);
-    const streamTabProps = {data, root, asset};
+    const slotProps = this.getSlotProps();
 
     if (!comment && !comments) {
       console.error('Talk: No comments came back from the graph given that query. Please, check the query params.');
@@ -159,8 +173,7 @@ class Stream extends React.Component {
 
         <Slot
           fill="stream"
-          data={this.props.data}
-          root={this.props.root}
+          {...slotProps}
         />
 
         {loggedIn && (
@@ -207,13 +220,16 @@ class Stream extends React.Component {
               <div
                 className={cn('talk-stream-filter-wrapper', styles.filterWrapper)}
               >
-                <Slot fill="streamFilter" />
+                <Slot
+                  fill="streamFilter"
+                  {...slotProps}
+                />
               </div>
               <TabBar activeTab={activeStreamTab} onTabClick={setActiveStreamTab} sub>
-                {getSlotComponents('streamTabs', reduxState, streamTabProps).map((PluginComponent) => (
+                {this.getSlotComponents('streamTabs').map((PluginComponent) => (
                   <Tab tabId={PluginComponent.talkPluginName} key={PluginComponent.talkPluginName}>
                     <PluginComponent
-                      {...streamTabProps}
+                      {...slotProps}
                       active={activeStreamTab === PluginComponent.talkPluginName}
                     />
                   </Tab>
@@ -223,10 +239,10 @@ class Stream extends React.Component {
                 </Tab>
               </TabBar>
               <TabContent activeTab={activeStreamTab} sub>
-                {getSlotComponents('streamTabPanes', reduxState, streamTabProps).map((PluginComponent) => (
+                {this.getSlotComponents('streamTabPanes').map((PluginComponent) => (
                   <TabPane tabId={PluginComponent.talkPluginName} key={PluginComponent.talkPluginName}>
                     <PluginComponent
-                      {...streamTabProps}
+                      {...slotProps}
                     />
                   </TabPane>
                 ))}
diff --git a/plugins/talk-plugin-featured-comments/client/containers/Tab.js b/plugins/talk-plugin-featured-comments/client/containers/Tab.js
index 27c504214..5d92387d6 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/Tab.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/Tab.js
@@ -1,5 +1,5 @@
 import {compose, gql} from 'react-apollo';
-import {withFragments} from 'plugin-api/beta/client/hocs';
+import {withFragments, excludeIf} from 'plugin-api/beta/client/hocs';
 import Tab from '../components/Tab';
 
 const enhance = compose(
@@ -9,6 +9,7 @@ const enhance = compose(
           featuredCommentsCount: totalCommentCount(tags: ["FEATURED"], excludeIgnored: $excludeIgnored)
       }`,
   }),
+  excludeIf((props) => props.asset.featuredCommentsCount === 0),
 );
 
 export default enhance(Tab);