diff --git a/public/src/templates.js b/public/src/templates.js
index 2516efb342..6a3f13a99e 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -355,7 +355,7 @@
 			}
 			
 			// clean up all undefined conditionals
-			template = template.replace(/<!-- IF([\s\S]*?)ENDIF([\s\S]*?)-->/gi, '');
+			template = template.replace(/<!-- IF([^@]*?)ENDIF([^@]*?)-->/gi, '');
 
 			return template;