diff --git a/src/App.tsx b/src/App.tsx
index a4fd279..039d081 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -3,7 +3,7 @@ import {MuiThemeProvider, CssBaseline, withStyles } from '@material-ui/core';
 import { setHyperspaceTheme, darkMode } from './utilities/themes';
 import AppLayout from './components/AppLayout';
 import {styles} from './App.styles';
-import {Route, Switch} from 'react-router-dom';
+import {Route} from 'react-router-dom';
 import AboutPage from './pages/About';
 import Settings from './pages/Settings';
 import { getUserDefaultBool, getUserDefaultTheme } from './utilities/settings';
@@ -50,22 +50,19 @@ class App extends Component<any, any> {
         <Route path="/welcome" component={WelcomePage}/>
           <div>
             { userLoggedIn()? <AppLayout/>: null}
-            <Switch>
-              <PrivateRoute exact path="/" component={HomePage}/>
-              <PrivateRoute path="/home" component={HomePage}/>
-              <PrivateRoute path="/local" component={LocalPage}/>
-              <PrivateRoute path="/public" component={PublicPage}/>
-              <PrivateRoute path="/messages" component={MessagesPage}/>
-              <PrivateRoute path="/notifications" component={NotificationsPage}/>
-              <PrivateRoute path="/profile/:profileId" component={ProfilePage}/>
-              <PrivateRoute path="/conversation/:conversationId" component={Conversation}/>
-              <PrivateRoute path="/search" component={SearchPage}/>
-              <PrivateRoute path="/settings" component={Settings}/>
-              <PrivateRoute path="/about" component={AboutPage}/>
-              <PrivateRoute path="/compose" component={Composer}/>
-              <PrivateRoute path="/recommended" component={RecommendationsPage}/>
-              <PrivateRoute component={Missingno}/>
-            </Switch>
+            <PrivateRoute exact path="/" component={HomePage}/>
+            <PrivateRoute path="/home" component={HomePage}/>
+            <PrivateRoute path="/local" component={LocalPage}/>
+            <PrivateRoute path="/public" component={PublicPage}/>
+            <PrivateRoute path="/messages" component={MessagesPage}/>
+            <PrivateRoute path="/notifications" component={NotificationsPage}/>
+            <PrivateRoute path="/profile/:profileId" component={ProfilePage}/>
+            <PrivateRoute path="/conversation/:conversationId" component={Conversation}/>
+            <PrivateRoute path="/search" component={SearchPage}/>
+            <PrivateRoute path="/settings" component={Settings}/>
+            <PrivateRoute path="/about" component={AboutPage}/>
+            <PrivateRoute path="/compose" component={Composer}/>
+            <PrivateRoute path="/recommended" component={RecommendationsPage}/>
           </div>
 
       </MuiThemeProvider>