diff --git a/src/router/router.js b/src/router/router.js
index efcf2f777..02eb68904 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -3126,6 +3126,7 @@
     BI.RouterWidget = BI.inherit(BI.Widget, {
       init: function () {
         this.$router = this._router = BI.Router.$router = $router = new VueRouter({
+          mode: this.options.mode,
           routes: this.options.routes
         });
         this.$router.beforeEach(function (to, from, next) {
diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js
index d3c0fb5bc..9e5a21432 100644
--- a/webpack/webpack.dev.js
+++ b/webpack/webpack.dev.js
@@ -36,11 +36,17 @@ module.exports = merge(common, {
     output: {
         path: dirs.DEST,
         filename: "[name].js",
+        publicPath: '/',
     },
     devServer: {
         contentBase: path.join(__dirname, ".."),
         port: 9001,
         liveReload: true,
+        historyApiFallback: {
+            rewrites: [
+                { from: /.*/, to: '/index.html' },
+            ],
+        },
     },
     plugins: [
         new MiniCssExtractPlugin({