diff --git a/formwork/views/errors/error.php b/formwork/views/errors/error.php
index f18c227d9..9f0464e84 100644
--- a/formwork/views/errors/error.php
+++ b/formwork/views/errors/error.php
@@ -2,7 +2,7 @@
 <h2>Oops, something went wrong!</h2>
 <p>Formwork encountered an error while serving your request.<br>If you are the maintainer of this site, please check Formwork configuration or the server log for errors.</p>
 <p><a href="https://github.com/getformwork/formwork/issues" target="_blank">Report an issue to GitHub</a></p>
-<?php if ($throwable && $app->config()->get('system.debug.enabled', false)) : ?>
+<?php if ($throwable && ($app->config()->get('system.debug.enabled', false) || $app->request()->isLocalhost())) : ?>
     <?php $this->insert('errors.partials.debug') ?>
 <?php endif ?>
 <?php $this->insert('errors.partials.footer') ?>
\ No newline at end of file
diff --git a/panel/views/errors/error.php b/panel/views/errors/error.php
index ebdb74a19..e158d3f05 100644
--- a/panel/views/errors/error.php
+++ b/panel/views/errors/error.php
@@ -24,7 +24,7 @@
                 <?php if (isset($action)) : ?><a class="action" href="<?= $action['href'] ?>"><?= $action['label'] ?></a><?php endif ?>
             </div>
         </div>
-        <?php if ($app->config()->get('system.debug.enabled') && isset($throwable)) : ?>
+        <?php if (isset($throwable) && ($app->config()->get('system.debug.enabled') || $app->request()->isLocalhost())) : ?>
             <div class="container-full">
                 <div class="error-debug-details">
                     <h3>Uncaught <code><?= $throwable::class ?></code>: <?= $throwable->getMessage() ?></h3>