diff --git a/apps/meteor/client/lib/2fa/process2faReturn.ts b/apps/meteor/client/lib/2fa/process2faReturn.ts
index 7bdac41bc1f50..36c46c0cec6e6 100644
--- a/apps/meteor/client/lib/2fa/process2faReturn.ts
+++ b/apps/meteor/client/lib/2fa/process2faReturn.ts
@@ -141,12 +141,13 @@ export const invokeTwoFactorModal = async (
 			props: {
 				...props,
 				onConfirm: async (code: string, method: string): Promise<void> => {
+					const actualCode = method === 'password' ? SHA256(code) : code;
 					if (validateCode) {
-						await validateCode(code, method);
+						await validateCode(actualCode, method);
 					}
 					isResolved = true;
 					imperativeModal.close();
-					resolve(method === 'password' ? SHA256(code) : code);
+					resolve(actualCode);
 				},
 				onClose: (): void => {
 					if (isClosed) {