diff --git a/src/Squidex/app-config/webpack.run.prod.js b/src/Squidex/app-config/webpack.run.prod.js
index f15097cff..5be6efb96 100644
--- a/src/Squidex/app-config/webpack.run.prod.js
+++ b/src/Squidex/app-config/webpack.run.prod.js
@@ -10,7 +10,9 @@ const plugins = {
     // https://www.npmjs.com/package/@ngtools/webpack
     NgToolsWebpack: require('@ngtools/webpack'),
     // https://github.com/webpack-contrib/mini-css-extract-plugin
-    MiniCssExtractPlugin: require('mini-css-extract-plugin')
+    MiniCssExtractPlugin: require('mini-css-extract-plugin'),
+    // https://github.com/NMFR/optimize-css-assets-webpack-plugin
+    OptimizeCSSAssetsPlugin: require("optimize-css-assets-webpack-plugin")
 };
             
 helpers.removeLoaders(runConfig, ['scss', 'ts']);
@@ -105,9 +107,15 @@ module.exports = webpackMerge(runConfig, {
                 uglifyOptions: {
                     compress: false,
                     ecma: 6,
-                    mangle: true
-                }
-            })
+                    mangle: true,
+                    output: {
+                        comments: false
+                    }
+                },
+                extractComments: true
+            }),
+
+            new plugins.OptimizeCSSAssetsPlugin({})
         ]
     },
 
diff --git a/src/Squidex/package.json b/src/Squidex/package.json
index bfd638c35..47b5decf3 100644
--- a/src/Squidex/package.json
+++ b/src/Squidex/package.json
@@ -85,6 +85,7 @@
     "node-sass": "4.9.4",
     "noop-loader": "1.0.0",
     "null-loader": "0.1.1",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
     "raw-loader": "0.5.1",
     "rimraf": "2.6.2",
     "rxjs-tslint": "0.1.5",