diff --git a/server/src/routes/auth.ts b/server/src/routes/auth.ts
index e8d376e0..865e1448 100644
--- a/server/src/routes/auth.ts
+++ b/server/src/routes/auth.ts
@@ -72,6 +72,9 @@ router.get('/current-user', async (req: AuthenticatedRequest, res) => {
         const user = await User.findByPk(req.user.id, {
             attributes: { exclude: ['password'] },
         });
+        if (!user) {
+            return res.status(404).json({ ok: false, error: 'User not found' });
+        }
         return res.status(200).json({ ok: true });
     } catch (error: any) {
         return res.status(500).send(`Could not fetch current user : ${error.message}.`);