diff --git a/src/app/sign-in/page.tsx b/src/app/sign-in/page.tsx
index 4e2d1af0..c61d4c23 100644
--- a/src/app/sign-in/page.tsx
+++ b/src/app/sign-in/page.tsx
@@ -75,9 +75,12 @@ export default function SignInPage() {
           });
         },
         onError: (ctx) => {
-          setError("email", { message: ctx.error.message });
-          setError("password", { message: ctx.error.message });
-          toast.error(ctx.error.message);
+          const errorMessage =
+            ctx.error.message ||
+            "Something went wrong. Please try again later.";
+          setError("email", { message: errorMessage });
+          setError("password", { message: errorMessage });
+          toast.error(errorMessage);
         },
       },
     );
diff --git a/src/app/sign-up/page.tsx b/src/app/sign-up/page.tsx
index 6a672b26..bc28ae0c 100644
--- a/src/app/sign-up/page.tsx
+++ b/src/app/sign-up/page.tsx
@@ -133,10 +133,14 @@ export default function SignUpPage() {
           // when email verification is required
           if (ctx.error.status === 403) {
             toast.error("Please verify your email address");
+            return;
           }
           // display the error message
           console.log("ctx in signUp onError", ctx);
-          toast.error(ctx.error.message);
+          const errorMessage =
+            ctx.error.message ||
+            "Something went wrong. Please try again later.";
+          toast.error(errorMessage);
         },
       },
     );