diff --git a/public/src/templates.js b/public/src/templates.js
index 538bd6b8ac..a004553b7c 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -394,11 +394,11 @@
 				var regex = new RegExp("{" + namespace + "[\\s\\S]*?}", 'g');
 				template = template.replace(regex, '');
 				namespace = '';
+			} else {
+				// clean up all undefined conditionals
+				template = template.replace(/<!-- IF([^@]*?)ENDIF([^@]*?)-->/gi, '');	
 			}
 
-			// clean up all undefined conditionals
-			template = template.replace(/<!-- IF([^@]*?)ENDIF([^@]*?)-->/gi, '');
-
 			return template;
 
 		})(data, "", template);