diff --git a/apps/login/src/components/set-password-form.tsx b/apps/login/src/components/set-password-form.tsx
index 860f21e42..e363596fd 100644
--- a/apps/login/src/components/set-password-form.tsx
+++ b/apps/login/src/components/set-password-form.tsx
@@ -101,21 +101,20 @@ export function SetPasswordForm({
       payload = { ...payload, code: values.code };
     }
 
-    const changeResponse = await changePassword(payload)
-      .catch(() => {
-        setError(t("set.errors.couldNotSetPassword"));
-        return;
-      })
-      .finally(() => {
-        setLoading(false);
-      });
+    const changeResponse = await changePassword(payload).catch(() => {
+      setError(t("set.errors.couldNotSetPassword"));
+      setLoading(false);
+      return;
+    });
 
     if (changeResponse && "error" in changeResponse) {
+      setLoading(false);
       setError(changeResponse.error);
       return;
     }
 
     if (!changeResponse) {
+      setLoading(false);
       setError(t("set.errors.couldNotSetPassword"));
       return;
     }
@@ -138,15 +137,13 @@ export function SetPasswordForm({
         password: { password: values.password },
       }),
       requestId,
-    })
-      .catch(() => {
-        setError(t("set.errors.couldNotVerifyPassword"));
-        return;
-      })
-      .finally(() => {
-        setLoading(false);
-      });
+    }).catch(() => {
+      setError(t("set.errors.couldNotVerifyPassword"));
+      setLoading(false);
+      return;
+    });
 
+    setLoading(false);
     handleServerActionResponse(passwordResponse as any, router, setSamlData, setError);
 
     return;