diff --git a/public/index.php b/public/index.php
index 02dffdbbfd..4676a4485c 100644
--- a/public/index.php
+++ b/public/index.php
@@ -3,7 +3,9 @@
 use Shopware\Core\HttpKernel;
 use Shopware\Core\Installer\InstallerKernel;
 use Symfony\Component\Dotenv\Dotenv;
+use Symfony\Component\ErrorHandler\BufferingLogger;
 use Symfony\Component\ErrorHandler\Debug;
+use Symfony\Component\ErrorHandler\ErrorHandler;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -58,6 +60,8 @@
     umask(0000);
 
     Debug::enable();
+} else {
+    ErrorHandler::register(new ErrorHandler(new BufferingLogger(), false));
 }
 
 $trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false;