diff --git a/res/values/evolution_strings.xml b/res/values/evolution_strings.xml
index c592cf611d9..51e76b4525b 100644
--- a/res/values/evolution_strings.xml
+++ b/res/values/evolution_strings.xml
@@ -298,4 +298,8 @@
     <!-- Idle manager -->
     <string name="idle_manager_title">Idle manager</string>
     <string name="idle_manager_summary">Stop all non-essential background processes when the device is idle</string>
+
+    <!-- fingerprint lockout -->
+    <string name="fingerprint_lockout_title">Disable fingerprint lockout</string>
+    <string name="fingerprint_lockout_summary">Deactivates 30 second timeout as well as permanent lockout after multiple failed fingerprint unlock attempts</string>
 </resources>
diff --git a/res/xml/security_settings_fingerprint.xml b/res/xml/security_settings_fingerprint.xml
index 2868351f802..8844dd1c3bd 100644
--- a/res/xml/security_settings_fingerprint.xml
+++ b/res/xml/security_settings_fingerprint.xml
@@ -81,6 +81,12 @@
             settings:keywords="@string/security_settings_screen_off_unlock_udfps_keywords"
             settings:controller="com.android.settings.biometrics.fingerprint.FingerprintSettingsScreenOffUnlockUdfpsPreferenceController"
             settings:isPreferenceVisible="false"/>
+
+        <org.evolution.settings.preferences.SystemSettingSwitchPreference
+            android:key="fingerprint_lockout"
+            android:title="@string/fingerprint_lockout_title"
+            android:summary="@string/fingerprint_lockout_summary"
+            android:defaultValue="false" />
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_fingerprint_limbo.xml b/res/xml/security_settings_fingerprint_limbo.xml
index 8b97c833e8d..04cf982e414 100644
--- a/res/xml/security_settings_fingerprint_limbo.xml
+++ b/res/xml/security_settings_fingerprint_limbo.xml
@@ -42,6 +42,12 @@
             android:summary="@string/security_settings_require_screen_on_to_auth_description"
             settings:keywords="@string/security_settings_require_screen_on_to_auth_keywords"
             settings:controller="com.android.settings.biometrics.fingerprint.FingerprintSettingsRequireScreenOnToAuthPreferenceController" />
+
+        <org.evolution.settings.preferences.SystemSettingSwitchPreference
+            android:key="fingerprint_lockout"
+            android:title="@string/fingerprint_lockout_title"
+            android:summary="@string/fingerprint_lockout_summary"
+            android:defaultValue="false" />
     </PreferenceCategory>
 
     <PreferenceCategory