diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index 010ee253f..42fbd72d4 100644
--- a/app/soapbox/features/ui/index.js
+++ b/app/soapbox/features/ui/index.js
@@ -213,8 +213,8 @@ class SwitchingColumnsArea extends React.PureComponent {
         <WrappedRoute path='/auth/mfa' layout={LAYOUT.DEFAULT} component={MfaForm} exact />
 
         <WrappedRoute path='/' exact page={HomePage} component={HomeTimeline} content={children} />
-        <WrappedRoute path='/timeline/local' exact page={HomePage} component={CommunityTimeline} content={children} />
-        <WrappedRoute path='/timeline/fediverse' exact page={HomePage} component={PublicTimeline} content={children} />
+        <WrappedRoute path='/timeline/local' exact page={HomePage} component={CommunityTimeline} content={children} publicRoute />
+        <WrappedRoute path='/timeline/fediverse' exact page={HomePage} component={PublicTimeline} content={children} publicRoute />
         <WrappedRoute path='/timeline/:instance' exact page={HomePage} component={RemoteTimeline} content={children} />
         <WrappedRoute path='/messages' layout={LAYOUT.DEFAULT} component={DirectTimeline} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
 
diff --git a/app/soapbox/pages/home_page.js b/app/soapbox/pages/home_page.js
index 01f299845..50233bb70 100644
--- a/app/soapbox/pages/home_page.js
+++ b/app/soapbox/pages/home_page.js
@@ -49,7 +49,7 @@ class HomePage extends ImmutablePureComponent {
 
             <div className='columns-area__panels__main'>
               <div className='columns-area columns-area--mobile'>
-                <div className='timeline-compose-block' ref={this.composeBlock}>
+                {me && <div className='timeline-compose-block' ref={this.composeBlock}>
                   <div className='timeline-compose-block__avatar'>
                     <Avatar account={account} size={46} />
                   </div>
@@ -58,7 +58,7 @@ class HomePage extends ImmutablePureComponent {
                     autoFocus={false}
                     clickableAreaRef={this.composeBlock}
                   />
-                </div>
+                </div>}
 
                 {children}
               </div>