diff --git a/r2/r2/config/environment.py b/r2/r2/config/environment.py
index ad7bada07..f22f8461d 100644
--- a/r2/r2/config/environment.py
+++ b/r2/r2/config/environment.py
@@ -68,7 +68,7 @@ def load_environment(global_conf={}, app_conf={}, setup_globals=True):
     #tmpl_options['myghty.escapes'] = dict(l=webhelpers.auto_link, s=webhelpers.simple_format)
 
     tmpl_options = config['buffet.template_options']
-    tmpl_options['mako.filesystem_checks'] = False
+    tmpl_options['mako.filesystem_checks'] = g.debug
     tmpl_options['mako.default_filters'] = ["mako_websafe"]
     tmpl_options['mako.imports'] = \
                                  ["from r2.lib.filters import websafe, unsafe, mako_websafe",