diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index 65b3936ccb8..53d9953781d 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -33,7 +33,7 @@ module.exports = {
   devtool: 'eval',
   entry: [
     require.resolve('webpack-dev-server/client') + '?http://localhost:3000',
-    require.resolve('webpack/hot/dev-server'),
+    require.resolve('webpack/hot/only-dev-server'),
     path.join(srcPath, 'index')
   ],
   output: {
@@ -59,6 +59,11 @@ module.exports = {
       }
     ],
     loaders: [
+      {
+        test: /\.js$/,
+        include: srcPath,
+        loader: 'react-hot'
+      },
       {
         test: /\.js$/,
         include: srcPath,
diff --git a/package.json b/package.json
index aed0d9fb586..47ea6a2fa56 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,8 @@
     "style-loader": "0.13.1",
     "url-loader": "0.5.7",
     "webpack": "1.13.1",
-    "webpack-dev-server": "1.14.1"
+    "webpack-dev-server": "1.14.1",
+    "react-hot-loader": "^1.3.0"
   },
   "devDependencies": {
     "bundle-deps": "^1.0.0",