diff --git a/packages/backend/src/app.ts b/packages/backend/src/app.ts
index 27f17690..20587705 100644
--- a/packages/backend/src/app.ts
+++ b/packages/backend/src/app.ts
@@ -35,13 +35,12 @@ app.use(function(req: Request, res: Response, next: NextFunction) {
 
 // error handler
 app.use(function(err: any, req: Request, res: Response, _next: NextFunction) {
-  // set locals, only providing error in development
-  res.locals.message = err.message;
-  res.locals.error = req.app.get('env') === 'development' ? err : {};
-
-  // render the error page
-  res.status(err.status || 500);
-  res.render('error');
+  if(err.message === 'Not Found') {
+    res.status(404).end()
+  } else {
+    logger.error(err.message)
+    res.status(500).end()
+  }
 });
 
 app.listen(port, () => {
diff --git a/packages/backend/src/helpers/morgan.ts b/packages/backend/src/helpers/morgan.ts
index 65934f76..92f9c124 100644
--- a/packages/backend/src/helpers/morgan.ts
+++ b/packages/backend/src/helpers/morgan.ts
@@ -7,7 +7,11 @@ const stream: StreamOptions = {
 };
 
 const registerGraphQLToken = () => {
-  morgan.token("graphql-query", (req: Request) => `GraphQL ${req.body.query}`);
+  morgan.token("graphql-query", (req: Request) => {
+    if(req.body.query) {
+      return `GraphQL ${req.body.query}`
+    }
+  });
 };
 
 registerGraphQLToken();