diff --git a/Riot/Modules/SetPinCode/SetPinCoordinator.swift b/Riot/Modules/SetPinCode/SetPinCoordinator.swift
index 5bc9ea80f..627f14730 100644
--- a/Riot/Modules/SetPinCode/SetPinCoordinator.swift
+++ b/Riot/Modules/SetPinCode/SetPinCoordinator.swift
@@ -145,7 +145,7 @@ extension SetPinCoordinator: EnterPinCodeCoordinatorDelegate {
     
     func enterPinCodeCoordinator(_ coordinator: EnterPinCodeCoordinatorType, didCompleteWithPin pin: String) {
         storePin(pin)
-        if pinCodePreferences.forcePinProtection && pinCodePreferences.isBiometricsAvailable {
+        if pinCodePreferences.forcePinProtection && pinCodePreferences.isBiometricsAvailable && !pinCodePreferences.isBiometricsSet {
             viewMode = .setupBiometricsAfterLogin
             setRootCoordinator(createSetupBiometricsCoordinator())
         } else {