diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift
index bc2e2fa626..9e0f428571 100644
--- a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift
+++ b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift
@@ -232,8 +232,6 @@ public final class AuthService {
       }
     } catch let error as NSError {
       authenticationState = .unauthenticated
-      updateError(message: string.localizedErrorMessage(for: error))
-
       // Check if this is an MFA required error
       if error.code == AuthErrorCode.secondFactorRequired.rawValue {
         if let resolver = error
@@ -242,6 +240,9 @@ public final class AuthService {
           pendingMFACredential = credentials
           return handleMFARequiredError(resolver: resolver)
         }
+      } else {
+        // Don't want error modal on MFA error so we only update here
+        updateError(message: string.localizedErrorMessage(for: error))
       }
 
       throw error