diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 9f778d3361..e48be70198 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -700,7 +700,7 @@ public class FragmentSetup extends FragmentBase {
         tvDoze12.setVisibility(Helper.isOptimizing12(getContext()) ? View.VISIBLE : View.GONE);
 
         grpInexactAlarms.setVisibility(
-                !AlarmManagerCompatEx.canScheduleExactAlarms(getContext()) || BuildConfig.DEBUG
+                !AlarmManagerCompatEx.canScheduleExactAlarms(getContext())
                         ? View.VISIBLE : View.GONE);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 80fcb5082f..c60ded3e39 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1068,9 +1068,6 @@ public class Helper {
 
     static boolean isStaminaEnabled(Context context) {
         // https://dontkillmyapp.com/sony
-        if (BuildConfig.DEBUG)
-            return true;
-
         if (!isSony())
             return false;