diff --git a/src/keepass2android/BiometricModule.cs b/src/keepass2android/BiometricModule.cs
index 0db899c5..13afd03b 100644
--- a/src/keepass2android/BiometricModule.cs
+++ b/src/keepass2android/BiometricModule.cs
@@ -376,7 +376,7 @@ namespace keepass2android
                     .SetUserAuthenticationRequired(true);
                 
                 if ((int)Build.VERSION.SdkInt >= 24)
-                    builder.SetInvalidatedByBiometricEnrollment(false);
+                    builder.SetInvalidatedByBiometricEnrollment(true);
 
                 _keyGen.Init(
                     builder
diff --git a/src/keepass2android/Resources/layout/fingerprint_setup.xml b/src/keepass2android/Resources/layout/fingerprint_setup.xml
index bf2532a2..b8650783 100644
--- a/src/keepass2android/Resources/layout/fingerprint_setup.xml
+++ b/src/keepass2android/Resources/layout/fingerprint_setup.xml
@@ -73,6 +73,12 @@
         android:layout_height="wrap_content"
 		android:layout_marginLeft="12dp"
         android:text="@string/CloseDbAfterFailedAttempts" />
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="12dp"
+        android:text="@string/WarnFingerprintInvalidated"
+      />
     </LinearLayout>
     <RelativeLayout
         android:id="@+id/fingerprint_auth_container"
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 7c907116..7b9dc455 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -814,6 +814,7 @@
   <string name="EntryChannel_desc">Notification to simplify access to the currently selected entry.</string>
 
   <string name="CloseDbAfterFailedAttempts">Close database after three failed biometric unlock attempts.</string>
+  <string name="WarnFingerprintInvalidated">Warning! Biometric authentication can be invalidated by Android, e.g. after adding a new fingerprint in your device settings. Make sure you always know how to unlock with your master password!</string>
 
 
   <string-array name="ChangeLog_1_09a">