diff --git a/phpBB/phpbb/debug/error_handler.php b/phpBB/phpbb/debug/error_handler.php
index 39949d47bd..e05f0798ee 100644
--- a/phpBB/phpbb/debug/error_handler.php
+++ b/phpBB/phpbb/debug/error_handler.php
@@ -31,7 +31,7 @@ class error_handler extends ErrorHandler
 	 */
 	public function handleError(int $type, string $message, string $file, int $line): bool
 	{
-		if (!$this->debug)
+		if (!$this->debug || $type === E_USER_WARNING || $type === E_USER_NOTICE)
 		{
 			$handler = defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler';