diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 388b3a2b5a..6ddc11bd17 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -128,7 +128,15 @@ public class ApplicationEx extends Application implements SharedPreferences.OnSh
 
         DisconnectBlacklist.init(this);
 
-        WorkerWatchdog.init(this);
+        boolean watchdog = prefs.getBoolean("watchdog", true);
+        boolean enabled = prefs.getBoolean("enabled", true);
+        if (watchdog && enabled)
+            WorkerWatchdog.init(this);
+        else {
+            ServiceSynchronize.watchdog(this);
+            ServiceSend.watchdog(this);
+        }
+
         WorkerCleanup.init(this);
 
         registerReceiver(onScreenOff, new IntentFilter(Intent.ACTION_SCREEN_OFF));