diff --git a/packages/react-scripts/scripts/utils/frontierInit.js b/packages/react-scripts/scripts/utils/frontierInit.js
index c38f864e7f0..317e5e843cd 100644
--- a/packages/react-scripts/scripts/utils/frontierInit.js
+++ b/packages/react-scripts/scripts/utils/frontierInit.js
@@ -62,7 +62,7 @@ function installFrontierDependencies(appPath, answers, ownPath) {
     configureHF(appPath, ownPath);
   }
 
-  depsToInstall.push(...['http-proxy-middleware@0.19.0', 'fs-webdev/exo']);
+  depsToInstall.push(...['http-proxy-middleware@0.19.0', 'fs-webdev/exo', '@reach/router']);
   devDepsToInstall.push(
     ...[
       'eslint@5.6.0',
diff --git a/packages/react-scripts/template-hf/src/setupProxy.js b/packages/react-scripts/template-hf/src/setupProxy.js
index c38642987b1..741e64354b9 100644
--- a/packages/react-scripts/template-hf/src/setupProxy.js
+++ b/packages/react-scripts/template-hf/src/setupProxy.js
@@ -14,7 +14,7 @@ module.exports = app => {
   snowConfig.app = app;
   snow(initiatedDirectory, hf, snowConfig);
 
-  app.get('/', (req, res) => {
+  app.get('*', (req, res) => {
     res.render('index', {
       indexPath: '../dist/_index.html',
       // _layoutFile: './async_layout'
diff --git a/packages/react-scripts/template/src/index.js b/packages/react-scripts/template/src/index.js
index b83f21d7461..4bc38897b73 100644
--- a/packages/react-scripts/template/src/index.js
+++ b/packages/react-scripts/template/src/index.js
@@ -1,13 +1,21 @@
+/* eslint-disable react/jsx-filename-extension */
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { Router } from '@reach/router';
 import './index.css';
 import App from './components/App';
 import * as serviceWorker from './serviceWorker';
 
-// eslint-disable-next-line react/jsx-filename-extension
-ReactDOM.render(<App />, document.getElementById('root'));
+ReactDOM.render(
+  <Router>
+    <App path="/" />
+  </Router>,
+  document.getElementById('root')
+);
 
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.
 // Learn more about service workers: http://bit.ly/CRA-PWA
 serviceWorker.unregister();
+
+/* eslint-enable react/jsx-filename-extension */