diff --git a/packages/frontend/src/components/MkSignin.vue b/packages/frontend/src/components/MkSignin.vue
index 2e8169ec0b..21aa999da8 100644
--- a/packages/frontend/src/components/MkSignin.vue
+++ b/packages/frontend/src/components/MkSignin.vue
@@ -263,6 +263,16 @@ async function tryLogin(req: Partial<Misskey.entities.SigninRequest>): Promise<M
 	}).catch((err) => {
 		onSigninApiError(err);
 		return Promise.reject(err);
+	}).finally(() => {
+		if (doingPasskeyFromInputPage.value === true) {
+			doingPasskeyFromInputPage.value = false;
+			page.value = 'input';
+			password.value = '';
+		}
+		passwordPageEl.value?.resetCaptcha();
+		nextTick(() => {
+			waiting.value = false;
+		});
 	});
 }
 
@@ -353,16 +363,6 @@ function onSigninApiError(err?: any): void {
 			});
 		}
 	}
-
-	if (doingPasskeyFromInputPage.value === true) {
-		doingPasskeyFromInputPage.value = false;
-		page.value = 'input';
-		password.value = '';
-	}
-	passwordPageEl.value?.resetCaptcha();
-	nextTick(() => {
-		waiting.value = false;
-	});
 }
 
 onBeforeUnmount(() => {