diff --git a/packages/lib/server/getUserFromToken.ts b/packages/lib/server/getUserFromToken.ts
index 6f5f1d129..5efde79cb 100644
--- a/packages/lib/server/getUserFromToken.ts
+++ b/packages/lib/server/getUserFromToken.ts
@@ -12,12 +12,12 @@ export async function getUserFromToken(
   const tokenEmail = token?.email?.toString();
 
   if (!token) {
-    res.status(401).send("No token found for request.");
+    res.status(401).send("No session token found for request.");
     return null;
   }
 
   if (!tokenEmail) {
-    res.status(400).send("No email found in token.");
+    res.status(400).send("No email found in session token.");
     return null;
   }
 
@@ -25,5 +25,10 @@ export async function getUserFromToken(
     where: { email: tokenEmail },
   });
 
+  if (!user) {
+    res.status(401).end();
+    return null;
+  }
+
   return user;
 }