diff --git a/shared/chat/inbox-and-conversation-header.tsx b/shared/chat/inbox-and-conversation-header.tsx
index c35a5e7c9ed8..57173a958704 100644
--- a/shared/chat/inbox-and-conversation-header.tsx
+++ b/shared/chat/inbox-and-conversation-header.tsx
@@ -191,15 +191,15 @@ const Header = () => {
 
   const topRow = (
     <Kb.Box2 direction="horizontal" fullWidth={true}>
-      {channel ? (
+      {showActions && channel ? (
         <Kb.Text selectable={true} type="Header" lineClamp={1}>
           {channel}
         </Kb.Text>
-      ) : fullName ? (
+      ) : showActions && fullName ? (
         <Kb.Text type="Header" lineClamp={1}>
           {fullName}
         </Kb.Text>
-      ) : withoutSelf ? (
+      ) : showActions && withoutSelf ? (
         <Kb.Box2 direction="horizontal" flex={1}>
           <Kb.Text type="Header" lineClamp={1}>
             {withoutSelf.map((part, i) => (
diff --git a/shared/chat/inbox-and-conversation-shared.tsx b/shared/chat/inbox-and-conversation-shared.tsx
index 1fca9b1872b1..8cfa0f1242bc 100644
--- a/shared/chat/inbox-and-conversation-shared.tsx
+++ b/shared/chat/inbox-and-conversation-shared.tsx
@@ -36,8 +36,7 @@ export function InboxAndConversationShell(props: Props) {
     if (validConvoID) {
       return null
     }
-    const first = s.layout?.smallTeams?.[0]
-    return first?.convID
+    return s.layout?.smallTeams?.[0]?.convID
   })
 
   React.useEffect(() => {