diff --git a/templates/common/root/webpack.config.js b/templates/common/root/webpack.config.js
index 7a50f8f..4c69e48 100644
--- a/templates/common/root/webpack.config.js
+++ b/templates/common/root/webpack.config.js
@@ -19,7 +19,7 @@ module.exports = {
   debug: true,
   devtool: false,
   entry: [
-      'webpack/hot/dev-server',
+      'webpack/hot/only-dev-server',
       './src/scripts/components/<%= pkg.mainInput %>.jsx'
   ],
 
@@ -52,7 +52,8 @@ module.exports = {
   },
 
   plugins: [
-    new webpack.HotModuleReplacementPlugin()
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoErrorsPlugin()
   ]
 
 };
diff --git a/test/test-creation.js b/test/test-creation.js
index 1b44c5e..b006aa5 100644
--- a/test/test-creation.js
+++ b/test/test-creation.js
@@ -101,7 +101,8 @@ describe('react-webpack generator', function() {
             ['Gruntfile.js', /hot:\s*true/],
             ['webpack.config.js', /react-hot/],
             ['webpack.config.js', /webpack\.HotModuleReplacementPlugin/],
-            ['webpack.config.js', /webpack\/hot\/dev-server/]
+            ['webpack.config.js', /webpack\.NoErrorsPlugin/],
+            ['webpack.config.js', /webpack\/hot\/only-dev-server/]
         ]);
         done();
       });