diff --git a/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart b/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart
index 083f73d3..8aa2df0e 100644
--- a/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart
+++ b/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart
@@ -31,6 +31,8 @@ class PasscodeChangeConfirmPagePresenter extends PasscodeBasePagePresenter {
     _passcodeUseCase.setNeedSetPasscode(false);
     _passcodeUseCase.setPasscode(expectedNumbers.join());
 
-    navigator?.popFeature();
+    navigator?.popUntil((route) {
+      return route.settings.name?.contains('SecuritySettingsPage') ?? false;
+    });
   }
 }