diff --git a/apps/backend/package.json b/apps/backend/package.json
index 63503c4..cbf7a25 100644
--- a/apps/backend/package.json
+++ b/apps/backend/package.json
@@ -31,7 +31,7 @@
     "oslo": "^1.2.1",
     "pg": "^8.12.0",
     "postgres": "^3.4.4",
-    "resend": "^3.5.0",
+    "resend": "3.4.0",
     "ua-parser-js": "^1.0.38",
     "zod": "^3.23.8"
   },
diff --git a/apps/backend/src/v1/controllers/user/password-reset.ts b/apps/backend/src/v1/controllers/user/password-reset.ts
index 3904083..b3eafc2 100644
--- a/apps/backend/src/v1/controllers/user/password-reset.ts
+++ b/apps/backend/src/v1/controllers/user/password-reset.ts
@@ -1,5 +1,5 @@
 import { eq } from "drizzle-orm";
-import { Context } from "elysia";
+import { Context, error } from "elysia";
 
 import { db } from "@/db";
 import { userTable } from "@/db/schema/user";
@@ -22,23 +22,27 @@ export async function passwordReset(ctx: PasswordResetProps) {
     return `If a ${env.APP_NAME} account exists for ${ctx.body.email}, an e-mail will be sent with further instructions.`;
   }
 
-  const verificationToken = await createPasswordResetToken(user.id);
+  try {
+    const verificationToken = await createPasswordResetToken(user.id);
 
-  const verificationLink =
-    `${env.CLIENT_URL}/reset-password/` + verificationToken;
+    const verificationLink =
+      `${env.CLIENT_URL}/reset-password/` + verificationToken;
 
-  const { error } = await sendPasswordResetToken(
-    user.email,
-    verificationLink,
-    user.displayName
-  );
-
-  if (error) {
-    return ctx.error(
-      500,
-      "Unable to send reset link and it's not your fault, please try again later"
+    const { error } = await sendPasswordResetToken(
+      user.email,
+      verificationLink,
+      user.displayName
     );
-  }
 
-  return `If a ${env.APP_NAME} account exists for ${ctx.body.email}, an e-mail will be sent with further instructions.`;
+    if (error) {
+      return ctx.error(
+        500,
+        "Unable to send reset link, please try again later"
+      );
+    }
+
+    return `If a ${env.APP_NAME} account exists for ${ctx.body.email}, an e-mail will be sent with further instructions.`;
+  } catch (err) {
+    return error(500, "Internal Server Error");
+  }
 }
diff --git a/bun.lockb b/bun.lockb
index ebff7f4..eddd7ca 100644
Binary files a/bun.lockb and b/bun.lockb differ