diff --git a/frontend/public/index.html b/frontend/public/index.html
index ff0f5f9..f13871a 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <base href="%PUBLIC_URL%">
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
diff --git a/frontend/src/App.js b/frontend/src/App.js
index 5b6fc5f..7539be8 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -20,7 +20,7 @@ import {LoginButton} from 'components'
 
 const App = connect((state) => ({login: state.login}))(function App({login}) {
   return (
-    <Router>
+    <Router basename={process.env.PUBLIC_URL || '/'}>
       <div className={styles.App}>
         <header className={styles.headline}>
           <div className={styles.header}>
