diff --git a/package-lock.json b/package-lock.json
index bbf44e57..34d4bd85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7202,6 +7202,7 @@
       "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@discoveryjs/json-ext": "^0.5.0",
         "@webpack-cli/configtest": "^2.1.1",
diff --git a/webpack.config.js b/webpack.config.js
index 179493b1..47182ee9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -31,6 +31,10 @@ let babelRCOptions = {
 };
 
 module.exports = {
+    mode: 'production',
+    optimization: {
+        minimize: false  // Let grunt-terser handle minification to avoid double-minification
+    },
     // Tell Webpack which file kicks off our app.
     entry: {
         main: path.resolve(__dirname, 'rhodecode/public/js/src/components/index.js'),