diff --git a/frontend/packages/app/src/App.tsx b/frontend/packages/app/src/App.tsx
index 036a52b2e1..1936c63c98 100644
--- a/frontend/packages/app/src/App.tsx
+++ b/frontend/packages/app/src/App.tsx
@@ -6,12 +6,12 @@ import {
   Page,
   theme,
 } from '@backstage/core';
+import HomePagePlugin from '@backstage/plugin-home-page';
 //import PageHeader from './components/PageHeader';
 import { LoginComponent } from '@backstage/plugin-login';
-import HomePagePlugin from '@backstage/plugin-home-page';
 import { CssBaseline, makeStyles, ThemeProvider } from '@material-ui/core';
 import React, { FC } from 'react';
-import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
+import { BrowserRouter as Router } from 'react-router-dom';
 import HomePageTimer from './components/HomepageTimer';
 import SideBar from './components/SideBar';
 import entities from './entities';
@@ -92,20 +92,13 @@ const App: FC<{}> = () => {
   return (
     <CssBaseline>
       <ThemeProvider theme={BackstageTheme}>
-        <LoginBarrier fallback={Login} state$={currentUser.state}>
-          <AppShell>
-            <Router>
-              <Switch>
-                <Route path="/login">
-                  <Login />
-                </Route>
-                <Route>
-                  <AppComponent />
-                </Route>
-              </Switch>
-            </Router>
-          </AppShell>
-        </LoginBarrier>
+        <Router>
+          <LoginBarrier fallback={Login} state$={currentUser.state}>
+            <AppShell>
+              <AppComponent />
+            </AppShell>
+          </LoginBarrier>
+        </Router>
       </ThemeProvider>
     </CssBaseline>
   );
diff --git a/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx b/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx
index d9cb7217a6..d84256ac42 100644
--- a/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx
+++ b/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx
@@ -1,14 +1,12 @@
-import React, { FC } from 'react';
-import { InfoCard, EntityLink } from '@backstage/core';
-import { Link } from 'react-router-dom';
+import { EntityLink, InfoCard } from '@backstage/core';
 import { Typography } from '@material-ui/core';
+import React, { FC } from 'react';
 
 const HomePage: FC<{}> = () => {
   return (
     <InfoCard title="Home Page">
       <Typography variant="body1">Welcome to Backstage!</Typography>
       <div>
-        <Link to="/login">Go to Login</Link>
         <EntityLink kind="service" id="backstage-backend">
           Backstage Backend
         </EntityLink>