diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 1a96a53425..c563de3749 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -147,7 +147,12 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
 
         if (pm != null && !pm.isInteractive()) {
             Log.i("Stop with screen off");
-            Helper.clearAuthentication(this);
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+            boolean biometrics = prefs.getBoolean("biometrics", false);
+            if (biometrics) {
+                Helper.clearAuthentication(this);
+                finish();
+            }
         }
     }