diff --git a/webpack.config.js b/webpack.config.js
index 92dbebb5775679e890cf6c57b79bfbed028120e1..866a7a869ccac9c7131e8633a77cbac5cbc38017 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -235,15 +235,15 @@ if (NODE_ENV === "development" || NODE_ENV === "hot") {
             config.resolve.alias[name] = unminified;
         }
     }
+}
 
-    config.plugins.push(new FlowStatusWebpackPlugin())
+if (process.env.ENABLE_FLOW) {
+    config.plugins.push(new FlowStatusWebpackPlugin());
 }
 
 if (NODE_ENV === "hot" || isWatching) {
     // enable "cheap" source maps in hot or watch mode since re-build speed overhead is < 1 second
     config.devtool = "eval-cheap-module-source-map";
-}
-
-if (NODE_ENV === "production") {
+} else if (NODE_ENV === "production") {
     config.devtool = "source-map";
 }