diff --git a/package.json b/package.json
index 47277b7..079c9b9 100644
--- a/package.json
+++ b/package.json
@@ -55,12 +55,13 @@
     "webpack-dev-server": "^1.14.1"
   },
   "dependencies": {
+    "connect-history-api-fallback": "^1.1.0",
     "express": "^4.13.4",
     "express-graphql": "^0.4.10",
     "graphql": "^0.4.18",
     "graphql-relay": "^0.3.6",
-    "normalize.css": "^3.0.3",
     "lodash": "^4.6.1",
+    "normalize.css": "^3.0.3",
     "react": "^0.14.7",
     "react-dom": "^0.14.7",
     "react-mdl": "^1.4.4",
diff --git a/server/index.js b/server/index.js
index 8ba450a..bad49fe 100644
--- a/server/index.js
+++ b/server/index.js
@@ -3,6 +3,7 @@ import webpack from 'webpack';
 import express from 'express';
 import graphQLHTTP from 'express-graphql';
 import WebpackDevServer from 'webpack-dev-server';
+import historyApiFallback from 'connect-history-api-fallback';
 import gaze from 'gaze';
 import requireUncached from './utils/requireUncached';
 import webpackConfig from '../webpack.config';
@@ -69,6 +70,7 @@ if (config.env === 'development') {
 } else if (config.env === 'production') {
   // Launch Relay by creating a normal express server
   relayServer = express();
+  relayServer.use(historyApiFallback());
   relayServer.use('/', express.static(path.join(__dirname, '../build')));
   relayServer.use('/graphql', graphQLHTTP({ schema }));
   relayServer.listen(config.port, () => console.log(`App is listening on port ${config.port}`));