diff --git a/src/app.ts b/src/app.ts
index c47d2579..4c0ffc7e 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -342,9 +342,9 @@ app.get('*', publicFiles, staticFiles, frontendController);
 
 app.onError((err, c) => {
   if (err.message === 'canceling statement due to statement timeout') {
-    return c.json({ error: "A timeout happened, don't worry :)" }, 500);
+    return c.json({ error: 'The server was unable to respond in a timely manner' }, 500);
   }
-  return c.json(500);
+  return c.json({ error: 'Something went wrong' }, 500);
 });
 
 export default app;