diff --git a/assets/build/config.js b/assets/build/config.js
index 8ba63b4..5fc6e87 100644
--- a/assets/build/config.js
+++ b/assets/build/config.js
@@ -40,3 +40,6 @@ module.exports = mergeWithConcat(config, {
   manifest: {},
 });
 
+if (config.enabled.watcher && !process.env.WEBPACK_PUBLIC_PATH) {
+  process.env.WEBPACK_PUBLIC_PATH = config.publicPath;
+}
diff --git a/assets/build/webpack.config.js b/assets/build/webpack.config.js
index f296c51..91ead54 100644
--- a/assets/build/webpack.config.js
+++ b/assets/build/webpack.config.js
@@ -49,6 +49,7 @@ let webpackConfig = {
         include: config.paths.assets,
         loader: ExtractTextPlugin.extract({
           fallbackLoader: 'style',
+          publicPath: '../',
           loader: [
             `css?${sourceMapQueryStr}`,
             'postcss',
@@ -60,6 +61,7 @@ let webpackConfig = {
         include: config.paths.assets,
         loader: ExtractTextPlugin.extract({
           fallbackLoader: 'style',
+          publicPath: '../',
           loader: [
             `css?${sourceMapQueryStr}`,
             'postcss',
@@ -140,8 +142,8 @@ let webpackConfig = {
       'window.Tether': 'tether',
     }),
     new webpack.DefinePlugin({
-      WEBPACK_PUBLIC_PATH: (config.enabled.watcher)
-        ? JSON.stringify(config.publicPath)
+      WEBPACK_PUBLIC_PATH: (process.env.WEBPACK_PUBLIC_PATH)
+        ? JSON.stringify(process.env.WEBPACK_PUBLIC_PATH)
         : false,
     }),
     new webpack.LoaderOptionsPlugin({