diff --git a/app.js b/app.js
index 0c66cc27..327d1f75 100644
--- a/app.js
+++ b/app.js
@@ -17,6 +17,7 @@ var morgan = require('morgan');
 var passportSocketIo = require("passport.socketio");
 var helmet = require('helmet');
 var i18n = require('i18n');
+var minifyHTML = require('express-minify-html');
 
 //core
 var config = require("./lib/config.js");
@@ -56,6 +57,18 @@ app.use(morgan('combined', {
     "stream": logger.stream
 }));
 
+if (!config.debug) {
+    app.use(minifyHTML({
+        override:      false,
+        htmlMinifier: {
+            removeComments:            true,
+            collapseWhitespace:        true,
+            collapseBooleanAttributes: true,
+            removeAttributeQuotes:     true,
+            removeEmptyAttributes:     true,
+    }));
+}
+
 //socket io
 var io = require('socket.io')(server);
 
diff --git a/package.json b/package.json
index 96b9c7e2..2e6377ff 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "ejs": "^2.5.2",
     "engine.io-client": "^1.7.0",
     "express": ">=4.14",
+    "express-minify-html": "^0.6.0",
     "express-session": "^1.14.1",
     "file-saver": "^1.3.3",
     "flowchart.js": "^1.6.3",