diff --git a/app/components/Layout.js b/app/components/Layout.js
index 6ae688f9..82bbabaf 100644
--- a/app/components/Layout.js
+++ b/app/components/Layout.js
@@ -97,7 +97,7 @@ class Layout extends React.Component<Props> {
     return (
       <Container column auto>
         <Helmet>
-          <title>{`${team.name} | Outline` | "Outline"}</title>
+          <title>{team.name ? `${team.name} | Outline` : "Outline"}</title>
           <meta
             name="viewport"
             content="width=device-width, initial-scale=1.0"
diff --git a/app/components/PageTitle.js b/app/components/PageTitle.js
index b8b7f871..af02af4d 100644
--- a/app/components/PageTitle.js
+++ b/app/components/PageTitle.js
@@ -15,7 +15,9 @@ const { team } = auth;
 
 const PageTitle = observer(({ auth, title, favicon }: Props) => (
   <Helmet>
-    <title>{`${title} - ${team.name} | Outline` | `${title} - Outline`}</title>
+    <title>
+      {team.name ? `${title} - ${team.name} | Outline` : `${title} - Outline`}
+    </title>
     <link
       rel="shortcut icon"
       type="image/png"
@@ -24,6 +26,6 @@ const PageTitle = observer(({ auth, title, favicon }: Props) => (
     />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   </Helmet>
-);
+));
 
 export default inject("auth")(PageTitle);