diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
index 55f0122ad20a..06f6825fa9fd 100644
--- a/superset-frontend/webpack.config.js
+++ b/superset-frontend/webpack.config.js
@@ -344,6 +344,14 @@ const config = {
         ],
         use: [babelLoader],
       },
+      // react-hot-loader use "ProxyFacade", which is a wrapper for react Component
+      // see https://github.com/gaearon/react-hot-loader/issues/1311
+      // TODO: refactor recurseReactClone
+      {
+        test: /\.js$/,
+        include: /node_modules\/react-dom/,
+        use: ['react-hot-loader/webpack'],
+      },
       {
         test: /\.css$/,
         include: [APP_DIR, /superset-ui.+\/src/],