diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js
index 0c4fed129..cb4803a2d 100644
--- a/client/coral-embed-stream/src/components/Embed.js
+++ b/client/coral-embed-stream/src/components/Embed.js
@@ -16,6 +16,8 @@ import cn from 'classnames';
 
 export default class Embed extends React.Component {
   getTabs() {
+    if (!this.props.currentUser) return false;
+
     const tabs = [
       <Tab
         key="stream"
diff --git a/client/coral-embed-stream/src/components/ExtendableTabPanel.js b/client/coral-embed-stream/src/components/ExtendableTabPanel.js
index 1eb420ef0..1e78b21dd 100644
--- a/client/coral-embed-stream/src/components/ExtendableTabPanel.js
+++ b/client/coral-embed-stream/src/components/ExtendableTabPanel.js
@@ -16,9 +16,11 @@ class ExtendableTabPanel extends React.Component {
     } = this.props;
     return (
       <div {...rest}>
-        <TabBar activeTab={activeTab} onTabClick={setActiveTab} sub={sub}>
-          {tabs}
-        </TabBar>
+        {tabs && (
+          <TabBar activeTab={activeTab} onTabClick={setActiveTab} sub={sub}>
+            {tabs}
+          </TabBar>
+        )}
         {loading ? (
           <div className={styles.spinnerContainer}>
             <Spinner />