diff --git a/lib/templates.js b/lib/templates.js
index f9caaa4498d74201b59fbe41a1b76b3857f0dee1..14f04e78e95e45ce74a66a948118d2b70d286d01 100644
--- a/lib/templates.js
+++ b/lib/templates.js
@@ -41,6 +41,9 @@ exports.generate = function generate(templatesDir, namePrefix, lastGen) {
       var templateName = namePrefix + fileName.replace(/\.ejs/, '');
       var templateText = fs.readFileSync(path.join(templatesDir, fileName), "utf8");
 
+      // remove HTML comments
+      templateText = templateText.replace(/<!--[\s\S]*?-->/g, '');
+
       templates[templateName] = ejs.compile(templateText, {
         client: true,
         compileDebug: !config.get('use_minified_resources')