diff --git a/src/server/index.tsx b/src/server/index.tsx
index 47262ede..85112b34 100644
--- a/src/server/index.tsx
+++ b/src/server/index.tsx
@@ -294,13 +294,11 @@ async function fetchIconPng(iconUrl: string) {
     .then(blob => blob.arrayBuffer());
 }
 
-function getErrorPageData(error: string, site?: GetSiteResponse) {
+function getErrorPageData(error: Error, site?: GetSiteResponse) {
   const errorPageData: ErrorPageData = {};
 
-  // Exact error should only be seen in a development environment. Users
-  // in production will get a more generic message.
-  if (process.env.NODE_ENV === "development") {
-    errorPageData.error = error;
+  if (site) {
+    errorPageData.error = error.message;
   }
 
   const adminMatrixIds = site?.admins
diff --git a/src/shared/components/app/error-page.tsx b/src/shared/components/app/error-page.tsx
index 243a4a4f..2a6c1a14 100644
--- a/src/shared/components/app/error-page.tsx
+++ b/src/shared/components/app/error-page.tsx
@@ -57,12 +57,7 @@ export class ErrorPage extends Component<any, any> {
             </>
           )}
         {errorPageData?.error && (
-          <code
-            style={{ "text-align": "start" }}
-            className="d-block bg-dark text-light p-2 mt-4"
-          >
-            {errorPageData.error}
-          </code>
+          <strong className="d-block">Error Code: {errorPageData.error}</strong>
         )}
       </div>
     );