diff --git a/lib/loader.js b/lib/loader.js
index 1dabc7b86..48b8d0940 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -338,8 +338,15 @@ module.exports = function (content) {
         '    hotAPI.createRecord("' + moduleId + '", Component.options)\n' +
         '  } else {\n' +
         // update
+        '    if (module.hot.data.cssModules && JSON.stringify(module.hot.data.cssModules) !== JSON.stringify(cssModules)) {\n' +
+        '      delete Component.options._Ctor\n' +
+        '    }\n' +
         '    hotAPI.reload("' + moduleId + '", Component.options)\n' +
         '  }\n' +
+        // save cssModules
+        '  module.hot.dispose(function (data) {\n' +
+        '    data.cssModules = cssModules\n' +
+        '  })\n' +
         '})()}\n'
     }
     // final export