diff --git a/app/components/Auth.js b/app/components/Auth.js
index a4ca6d67..2a6b33ac 100644
--- a/app/components/Auth.js
+++ b/app/components/Auth.js
@@ -24,15 +24,6 @@ const Auth = observer(({ auth, children }: Props) => {
       return <LoadingIndicator />;
     }
 
-    // Check the current origin against the teams url, if they differ we need to
-    // redirect to the canonical subdomain for this team
-    // if (window.location.origin !== team.url) {
-    //   const redirectTo = `${team.url}${window.location.pathname}`;
-    //   console.warn(`Redirecting to ${redirectTo}…`);
-    //   window.location.href = redirectTo;
-    //   return <LoadingIndicator />;
-    // }
-
     // Only initialize stores once. Kept in global scope because otherwise they
     // will get overridden on route change
     if (!authenticatedStores) {
diff --git a/server/pages/components/Navigation.js b/server/pages/components/Navigation.js
index 8e83191f..5fd16da2 100644
--- a/server/pages/components/Navigation.js
+++ b/server/pages/components/Navigation.js
@@ -9,6 +9,7 @@ import { fadeAndScaleIn } from '../../../shared/styles/animations';
 import {
   developers,
   changelog,
+  features,
   about,
   privacy,
   githubUrl,
@@ -38,7 +39,7 @@ function TopNavigation({ sessions, loggedIn }: Props) {
       <Brand href={process.env.URL}>Outline</Brand>
       <Menu>
         <MenuItemDesktop>
-          <a href="/#features">Features</a>
+          <a href={features()}>Features</a>
         </MenuItemDesktop>
         <MenuItemDesktop>
           <a href={about()}>About</a>
diff --git a/shared/utils/routeHelpers.js b/shared/utils/routeHelpers.js
index 67e6c34a..a1d761df 100644
--- a/shared/utils/routeHelpers.js
+++ b/shared/utils/routeHelpers.js
@@ -53,22 +53,26 @@ export function mailToUrl(): string {
   return 'mailto:hello@getoutline.com';
 }
 
+export function features(): string {
+  return `${process.env.URL}/#features`;
+}
+
 export function developers(): string {
-  return '/developers';
+  return `${process.env.URL}/developers`;
 }
 
 export function changelog(): string {
-  return '/changelog';
+  return `${process.env.URL}/changelog`;
 }
 
 export function signin(service: string = 'slack'): string {
-  return `/auth/${service}`;
+  return `${process.env.URL}/auth/${service}`;
 }
 
 export function about(): string {
-  return '/about';
+  return `${process.env.URL}/about`;
 }
 
 export function privacy(): string {
-  return '/privacy';
+  return `${process.env.URL}/privacy`;
 }