diff --git a/lib/server.js b/lib/server.js
index <HASH>..<HASH> 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -74,9 +74,9 @@ Server.prototype.server = function () {
   if (logging) app.use(morgan(logging));
   app.use(compression());
   app.use(errorhandler());
-  app.get('/', this.handleRender.bind(this));
   app.get('/build/*', this.handleBuild.bind(this));
   app.use('/build', serveStatic(this.root()));
+  app.get('*', this.handleRender.bind(this));
 
   return app;
 };
diff --git a/test/server.js b/test/server.js
index <HASH>..<HASH> 100644
--- a/test/server.js
+++ b/test/server.js
@@ -27,6 +27,13 @@ describe('Web Server', function () {
       .end(done);
   });
 
+  it('should render the root even for alternate paths', function (done) {
+    request(app)
+      .get('/hello/world')
+      .expect(200, read(fixture('simple/out.html'), 'utf8'))
+      .end(done);
+  });
+
   it('should render the expected css', function (done) {
     request(app)
       .get('/build/index.css')
allowing any path to serve the root (for spa-like apps)