diff --git a/public/src/templates.js b/public/src/templates.js
index d9872cb0ed..2f2d9ad9fe 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -406,7 +406,7 @@
 				namespace = '';
 			} else {
 				// clean up all undefined conditionals
-				template = template.replace(/<!-- IF([^@]*?)ENDIF([^@]*?)-->/gi, '');
+				template = template.replace(/(<!-- IF([^@]*?)(ELSE -->| -->))|(<!-- ENDIF([^@]*?)-->)/gi, '');
 			}
 
 			return template;