diff --git a/server.dev.js b/server.dev.js
index 3461d943..026a7a17 100644
--- a/server.dev.js
+++ b/server.dev.js
@@ -20,15 +20,11 @@ config.entry.unshift(`webpack-dev-server/client?http://${HOST}:${PORT}/`,
                      'webpack/hot/dev-server');
 config.plugins.push(new webpack.HotModuleReplacementPlugin());
 
-// Specify output location for bundled files
-config.output.publicPath = '/static/';
-
 // Configure server
 const compiler = webpack(config);
 
 const server = new WebpackDevServer(compiler, {
     publicPath: config.output.publicPath,
-    contentBase: './build',
     historyApiFallback: {
         index: config.output.publicPath
     },
diff --git a/webpack.config.js b/webpack.config.js
index 3c321f26..713b319a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -191,6 +191,7 @@ const config = {
     output: {
         filename: PRODUCTION ? 'js/bundle.min.js' : 'js/bundle.js',
         path: PRODUCTION ? PATHS.DIST : PATHS.BUILD,
+        publicPath: '/static/',
     },
 
     debug: !PRODUCTION,