diff --git a/new-ui/src/pages/full/EnrollmentPage/steps/PasswordStep/PasswordStep.tsx b/new-ui/src/pages/full/EnrollmentPage/steps/PasswordStep/PasswordStep.tsx
index fc4be3e9..5a260c46 100644
--- a/new-ui/src/pages/full/EnrollmentPage/steps/PasswordStep/PasswordStep.tsx
+++ b/new-ui/src/pages/full/EnrollmentPage/steps/PasswordStep/PasswordStep.tsx
@@ -77,7 +77,7 @@ export const PasswordStep = () => {
     onSubmit: async ({ value }) => {
       try {
         const { skipMfaChoice, skipMfa } = useEnrollmentStore.getState();
-        if (skipMfaChoice) {
+        if (!skipMfa && skipMfaChoice) {
           const mfaResponse = await startMfa();
           useEnrollmentStore.setState({
             userTotpSecret: mfaResponse.totp_secret,