diff --git a/phpBB/config/development/config.yml b/phpBB/config/development/config.yml
index 67c0e5a871..0689521cac 100644
--- a/phpBB/config/development/config.yml
+++ b/phpBB/config/development/config.yml
@@ -8,6 +8,7 @@ core:
         exceptions: true
         load_time: true
         sql_explain: true
+        errors_show: true
 
     twig:
         debug: true
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 7a978553bd..465806f674 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3252,6 +3252,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 {
 	global $cache, $db, $auth, $template, $config, $user, $request;
 	global $phpbb_root_path, $msg_title, $msg_long_text, $phpbb_log;
+	global $phpbb_container;
 
 	// Do not display notices if we suppress them via @
 	if (error_reporting() == 0 && $errno != E_USER_ERROR && $errno != E_USER_WARNING && $errno != E_USER_NOTICE)
@@ -3272,7 +3273,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 
 			// Check the error reporting level and return if the error level does not match
 			// If DEBUG is defined the default level is E_ALL
-			if (($errno & ((defined('DEBUG')) ? E_ALL : error_reporting())) == 0)
+			if (($errno & ($phpbb_container->getParameter('debug.errors_show') ? E_ALL : error_reporting())) == 0)
 			{
 				return;
 			}
@@ -3330,7 +3331,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 				$log_text .= '<br /><br />BACKTRACE<br />' . $backtrace;
 			}
 
-			if (defined('IN_INSTALL') || defined('DEBUG') || isset($auth) && $auth->acl_get('a_'))
+			if (defined('IN_INSTALL') || $phpbb_container->getParameter('debug.errors_show') || isset($auth) && $auth->acl_get('a_'))
 			{
 				$msg_text = $log_text;
 
diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
index 3a6502a4b3..0b0a848822 100644
--- a/phpBB/phpbb/di/extension/container_configuration.php
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -37,6 +37,7 @@ class container_configuration implements ConfigurationInterface
 						->booleanNode('exceptions')->defaultValue(false)->end()
 						->booleanNode('load_time')->defaultValue(false)->end()
 						->booleanNode('sql_explain')->defaultValue(false)->end()
+						->booleanNode('errors_show')->defaultValue(false)->end()
 					->end()
 				->end()
 				->arrayNode('twig')