diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index d6840ec65ca2..ca85b3862934 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -47,8 +47,9 @@ class Handler extends ExceptionHandler {
         if ($e instanceof ModelNotFoundException) {
             return Redirect::to('/');
         }
-
-        if (Utils::isNinjaProd()) {
+        
+        // In production, except for maintenance mode, we'll show a custom error screen
+        if (Utils::isNinjaProd() && $e->getStatusCode() != 503) {
             $data = [
                 'error' => get_class($e),
                 'hideHeader' => true,