diff --git a/lib/commands/serve.js b/lib/commands/serve.js
index 9b89633..2e5155d 100644
--- a/lib/commands/serve.js
+++ b/lib/commands/serve.js
@@ -3,6 +3,7 @@
 const serveStatic = require('serve-static')
 const connect = require('connect')
 const livereload = require('connect-livereload')
+const history = require('connect-history-api-fallback')
 const lrserver = require('livereload')
 const open = require('open')
 const chalk = require('chalk')
@@ -27,7 +28,8 @@ module.exports = function (
     })
     .then(_ => {
       path = resolve(path || '.')
-      const indexFile = resolve(path, indexName || 'index.html')
+      const indexFileName = indexName || 'index.html'
+      const indexFile = resolve(path, indexFileName)
 
       if (!exists(indexFile)) {
         const msg =
@@ -46,6 +48,7 @@ module.exports = function (
           port: livereloadPort
         })
       )
+      server.use(history({index: '/' + indexFileName}))
       server.use(serveStatic(path, {index: indexName}))
       server.listen(port)
       lrserver
diff --git a/package-lock.json b/package-lock.json
index e8c8230..ca550cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1371,6 +1371,11 @@
         "utils-merge": "1.0.1"
       }
     },
+    "connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
+    },
     "connect-livereload": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz",
diff --git a/package.json b/package.json
index 25c7a49..fb9aed3 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
   "dependencies": {
     "chalk": "^2.4.2",
     "connect": "^3.6.0",
+    "connect-history-api-fallback": "^1.6.0",
     "connect-livereload": "^0.6.0",
     "cp-file": "^7.0.0",
     "docsify": "^4.12.2",