diff --git a/client/src/App.tsx b/client/src/App.tsx
index 68faaea..1e2520e 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -1,24 +1,24 @@
-import { useEffect } from 'react';
-import { BrowserRouter, Route, Switch } from 'react-router-dom';
 import 'external-svg-loader';
 
-// Redux
+import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { BrowserRouter, Route, Switch } from 'react-router-dom';
 import { bindActionCreators } from 'redux';
-import { autoLogin, getConfig } from './store/action-creators';
-import { actionCreators, store } from './store';
-import { State } from './store/reducers';
 
-// Utils
+import { Apps } from './components/Apps/Apps';
+import { Bookmarks } from './components/Bookmarks/Bookmarks';
+import { Home } from './components/Home/Home';
+import { NotificationCenter } from './components/NotificationCenter/NotificationCenter';
+import { Settings } from './components/Settings/Settings';
+import NotFound from './NotFound';
+import { actionCreators, store } from './store';
+import { autoLogin, getConfig } from './store/action-creators';
+import { State } from './store/reducers';
 import { checkVersion, decodeToken } from './utility';
 
+// Redux
+// Utils
 // Routes
-import { Home } from './components/Home/Home';
-import { Apps } from './components/Apps/Apps';
-import { Settings } from './components/Settings/Settings';
-import { Bookmarks } from './components/Bookmarks/Bookmarks';
-import { NotificationCenter } from './components/NotificationCenter/NotificationCenter';
-
 // Get config
 store.dispatch<any>(getConfig());
 
@@ -80,6 +80,7 @@ export const App = (): JSX.Element => {
           <Route path="/settings" component={Settings} />
           <Route path="/applications" component={Apps} />
           <Route path="/bookmarks" component={Bookmarks} />
+          <Route component={NotFound} />
         </Switch>
       </BrowserRouter>
       <NotificationCenter />
diff --git a/client/src/NotFound.module.css b/client/src/NotFound.module.css
new file mode 100644
index 0000000..c27caa5
--- /dev/null
+++ b/client/src/NotFound.module.css
@@ -0,0 +1,6 @@
+.Title {
+  color: var(--color-primary);
+  font-weight: 500;
+  font-size: 3em;
+  display: block;
+}
diff --git a/client/src/NotFound.tsx b/client/src/NotFound.tsx
new file mode 100644
index 0000000..6ed51f1
--- /dev/null
+++ b/client/src/NotFound.tsx
@@ -0,0 +1,13 @@
+import { Link } from 'react-router-dom';
+
+import { Container } from './components/UI';
+import classes from './NotFound.module.css';
+
+const NotFound = () => (
+  <Container>
+    <h1 className={classes.Title}>404 - Not Found!</h1>
+    <Link to="/">Return to homepage</Link>
+  </Container>
+);
+
+export default NotFound;
\ No newline at end of file