diff --git a/src/commands/login.command.ts b/src/commands/login.command.ts
index c06ed696cc..08667e1ee4 100644
--- a/src/commands/login.command.ts
+++ b/src/commands/login.command.ts
@@ -124,14 +124,15 @@ export class LoginCommand {
                         }
                     }
 
-                    const twoFactorResponse = await this.authService.logInTwoFactor(selectedProvider.type,
+                    response = await this.authService.logInTwoFactor(selectedProvider.type,
                         twoFactorToken, false);
-                    if (twoFactorResponse.twoFactor) {
-                        return Response.error('Login failed.');
-                    }
                 }
             }
 
+            if (response.twoFactor) {
+                return Response.error('Login failed.');
+            }
+
             await this.syncService.fullSync(true);
             const res = new MessageResponse('You are logged in!', '\n' +
                 'To unlock your vault, set your session key to the `BW_SESSION` environment variable. ex:\n' +