diff --git a/client/contexts/AuthContext.tsx b/client/contexts/AuthContext.tsx
index 1e1873ae..5f039c70 100644
--- a/client/contexts/AuthContext.tsx
+++ b/client/contexts/AuthContext.tsx
@@ -860,9 +860,11 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({
         try {
           await supabase.auth.getSession();
         } catch {}
-        const { data, error } = await supabase.auth.updateUser({
-          password: newPassword,
-        });
+        const { data, error } = await withTimeout(
+          supabase.auth.updateUser({ password: newPassword }),
+          8000,
+          "Password update timed out"
+        );
         if (error) throw error;
         if (data?.user) {
           aethexToast.success({