diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
index 425f595eede..7666a3609cc 100644
--- a/src/com/android/settings/password/BiometricFragment.java
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -114,7 +114,8 @@ public class BiometricFragment extends InstrumentedFragment {
 
     private void cleanup() {
         if (getActivity() != null) {
-            getActivity().getSupportFragmentManager().beginTransaction().remove(this).commit();
+            getActivity().getSupportFragmentManager().beginTransaction().remove(this)
+                    .commitAllowingStateLoss();
         }
     }