diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index 86c04195de..5843cc0762 100644
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
@@ -75,7 +75,7 @@ class environment extends \Twig\Environment
 
 		$options = array_merge(array(
 			'cache'			=> (defined('IN_INSTALL')) ? false : $cache_path,
-			'debug'			=> true,
+			'debug'			=> false,
 			'auto_reload'	=> (bool) $this->phpbb_config['load_tplcompile'],
 			'autoescape'	=> false,
 		), $options);
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index 14dd5734ce..1259618175 100644
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -90,7 +90,6 @@ class twig extends \phpbb\template\base
 		{
 			$this->twig->addExtension($extension);
 		}
-		$this->twig->addExtension(new \Twig\Extension\DebugExtension());
 
 		// Add admin namespace
 		if ($this->path_helper->get_adm_relative_path() !== null