diff --git a/app/components/Sidebar/Shared.tsx b/app/components/Sidebar/Shared.tsx
index faa63a4af..129cd3060 100644
--- a/app/components/Sidebar/Shared.tsx
+++ b/app/components/Sidebar/Shared.tsx
@@ -29,7 +29,7 @@ function SharedSidebar({ rootNode, shareId }: Props) {
 
   return (
     <Sidebar>
-      {team && (
+      {team?.name && (
         <SidebarButton
           title={team.name}
           image={<TeamLogo model={team} size={32} alt={t("Logo")} />}
diff --git a/app/components/Sidebar/components/SharedDocumentLink.tsx b/app/components/Sidebar/components/SharedDocumentLink.tsx
index ff1adceb1..9c1e70e03 100644
--- a/app/components/Sidebar/components/SharedDocumentLink.tsx
+++ b/app/components/Sidebar/components/SharedDocumentLink.tsx
@@ -101,6 +101,8 @@ function DocumentLink(
     (activeDocument?.id === node.id ? activeDocument.title : node.title) ||
     t("Untitled");
 
+  const icon = node.icon ?? node.emoji;
+
   return (
     <>
       <SidebarLink
@@ -112,7 +114,7 @@ function DocumentLink(
         }}
         expanded={hasChildDocuments && depth !== 0 ? expanded : undefined}
         onDisclosureClick={handleDisclosureClick}
-        icon={node.icon && <Icon value={node.icon} color={node.color} />}
+        icon={icon && <Icon value={icon} color={node.color} />}
         label={title}
         depth={depth}
         exact={false}