diff --git a/src/etc/inc/plugins.inc.d/webgui.inc b/src/etc/inc/plugins.inc.d/webgui.inc
index afeefaf77..7e9b33cd8 100644
--- a/src/etc/inc/plugins.inc.d/webgui.inc
+++ b/src/etc/inc/plugins.inc.d/webgui.inc
@@ -434,12 +434,6 @@ EOD;
         $lighty_config .= "}\n";
     }
 
-    if (empty($config['system']['deployment']) || $config['system']['deployment'] == 'development') {
-        $lighty_config .= "# send static error pages for some errors in non-debug mode\n";
-        $lighty_config .= "server.error-intercept = \"enable\"\n";
-        $lighty_config .= "server.errorfile-prefix = \"/usr/local/opnsense/data/webgui/status-\"\n";
-    }
-
     $lighty_config .= <<<EOD
 
 ## error-handler for status 404
diff --git a/src/etc/rc.subr.d/recover b/src/etc/rc.subr.d/recover
index a18f1f6ca..c15eb3810 100755
--- a/src/etc/rc.subr.d/recover
+++ b/src/etc/rc.subr.d/recover
@@ -208,7 +208,7 @@ zlib.output_compression_level = 1
 include_path = "/usr/local/etc/inc:/usr/local/www:/usr/local/opnsense/mvc:/usr/local/opnsense/contrib:/usr/local/share/pear:/usr/local/share"
 ignore_repeated_errors = on
 error_reporting = E_ALL ^ (E_WARNING | E_NOTICE | E_DEPRECATED | E_STRICT | E_CORE_WARNING | E_COMPILE_WARNING)
-display_errors=off
+display_errors=on
 display_startup_errors=off
 log_errors=on
 error_log=/tmp/PHP_errors.log
diff --git a/src/opnsense/service/templates/OPNsense/WebGui/php.ini b/src/opnsense/service/templates/OPNsense/WebGui/php.ini
index 7cbca8416..daea00d24 100644
--- a/src/opnsense/service/templates/OPNsense/WebGui/php.ini
+++ b/src/opnsense/service/templates/OPNsense/WebGui/php.ini
@@ -25,7 +25,7 @@ error_reporting = E_ALL ^ (E_WARNING | E_NOTICE | E_DEPRECATED | E_STRICT | E_CO
 {% else %}
 error_reporting = E_ALL
 {% endif %}
-display_errors={% if system.deployment|default("") == "debug" %}on{%else%}off{%endif%}
+display_errors={% if system.deployment|default("") != "development" %}on{%else%}off{%endif%}
 
 display_startup_errors={% if system.deployment|default("") == "debug" %}on{%else%}off{%endif%}
 
diff --git a/src/opnsense/www/api.php b/src/opnsense/www/api.php
index f614e4cd1..49c247e23 100644
--- a/src/opnsense/www/api.php
+++ b/src/opnsense/www/api.php
@@ -25,18 +25,22 @@ try {
 
     echo $application->handle($_SERVER['REQUEST_URI'])->getContent();
 } catch (\Error | \Exception $e) {
+    error_log($e);
+
     $response = [
         'errorMessage' => $e->getMessage(),
         'errorTrace' => $e->getTraceAsString(),
     ];
+
     if (method_exists($e, 'getTitle')) {
         $response['errorTitle'] = $e->getTitle();
     } else {
         $response['errorTitle'] = gettext('An API exception occurred');
         $response['errorMessage'] = $e->getFile() . ':' . $e->getLine() . ': ' . $response['errorMessage'];
-        error_log($e);
     }
+
     header('HTTP', true, 500);
     header("Content-Type: application/json;charset=utf-8");
+
     echo json_encode($response, JSON_UNESCAPED_SLASHES);
 }
diff --git a/src/opnsense/www/index.php b/src/opnsense/www/index.php
index af9ec8c8c..9984af1ab 100644
--- a/src/opnsense/www/index.php
+++ b/src/opnsense/www/index.php
@@ -70,16 +70,8 @@ try {
     $application = new \Phalcon\Mvc\Application($di);
 
     echo $application->handle($_SERVER['REQUEST_URI'])->getContent();
-} catch (\Exception $e) {
-    if (
-        isset($application) || (
-          stripos($e->getMessage(), ' handler class cannot be loaded') !== false ||
-          stripos($e->getMessage(), ' was not found on handler ') !== false
-        )
-    ) {
-        // Render default UI page when controller or action wasn't found
-        echo $application->handle('/ui/')->getContent();
-    } else {
-        echo $e->getMessage();
-    }
+} catch (\Error | \Exception $e) {
+    error_log($e);
+
+    header('Location: /crash_reporter.php', true, 303);
 }