diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index cdfe0e10cfd1f82cb508ab43e335682e6e86af4a..ade8e406648e1083e37c36b1a1d30544aa4ee3e2 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -102,7 +102,8 @@ def get_lookup():
     if mako_cache is None:
         mako_cache = ek(os.path.join, sickbeard.CACHE_DIR, 'mako')
     if mako_lookup is None:
-        mako_lookup = TemplateLookup(directories=[mako_path], module_directory=mako_cache, format_exceptions=True, strict_undefined=True)
+        use_strict = sickbeard.BRANCH and sickbeard.BRANCH != 'master'
+        mako_lookup = TemplateLookup(directories=[mako_path], module_directory=mako_cache, format_exceptions=True, strict_undefined=use_strict)
     return mako_lookup