diff --git a/src/app/modules/shared_modules/keycard_popup/internal/wrong_password_state.nim b/src/app/modules/shared_modules/keycard_popup/internal/wrong_password_state.nim
index 8ed768d096..19fcc1cb11 100644
--- a/src/app/modules/shared_modules/keycard_popup/internal/wrong_password_state.nim
+++ b/src/app/modules/shared_modules/keycard_popup/internal/wrong_password_state.nim
@@ -20,6 +20,11 @@ method executePrePrimaryStateCommand*(self: WrongPasswordState, controller: Cont
     else:
       controller.setKeycardData(updatePredefinedKeycardData(controller.getKeycardData(), PredefinedKeycardData.WrongPassword, add = true))
 
+method getNextPrimaryState*(self: WrongPasswordState, controller: Controller): State =
+  if self.flowType == FlowType.Authentication:
+    if not self.success:
+      return self
+
 method executePreSecondaryStateCommand*(self: WrongPasswordState, controller: Controller) =
   if self.flowType == FlowType.Authentication:
     controller.tryToObtainDataFromKeychain()