diff --git a/ui/app/AppLayouts/Profile/views/profile/MyProfileSettingsView.qml b/ui/app/AppLayouts/Profile/views/profile/MyProfileSettingsView.qml
index 40598a4e0b..89dd2b6737 100644
--- a/ui/app/AppLayouts/Profile/views/profile/MyProfileSettingsView.qml
+++ b/ui/app/AppLayouts/Profile/views/profile/MyProfileSettingsView.qml
@@ -67,9 +67,10 @@ ColumnLayout {
                                      (profileHeader.cropRect.x + profileHeader.cropRect.width).toFixed(),
                                      (profileHeader.cropRect.y + profileHeader.cropRect.height).toFixed());
         }
-        if (biometricsSwitch.checked)
+
+        if (biometricsSwitch.checked && !biometricsSwitch.currentStoredValue)
             Global.openPopup(storePasswordModal)
-        else
+        else if (!biometricsSwitch.checked)
             localAccountSettings.storeToKeychainValue = Constants.keychain.storedValue.never;
 
         reset()