diff --git a/app/src/main/java/eu/faircode/email/ServiceExternal.java b/app/src/main/java/eu/faircode/email/ServiceExternal.java
index 6ede2750b5..43d985f30d 100644
--- a/app/src/main/java/eu/faircode/email/ServiceExternal.java
+++ b/app/src/main/java/eu/faircode/email/ServiceExternal.java
@@ -72,6 +72,12 @@ public class ServiceExternal extends ServiceBase {
         startForeground(NotificationHelper.NOTIFICATION_EXTERNAL, getNotification());
     }
 
+    @Override
+    public void onTimeout(int startId) {
+        Log.e(new Throwable("onTimeout"));
+        stopSelf(startId);
+    }
+
     @Override
     public void onDestroy() {
         Log.i("Service external destroy");
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 3e6a7cbeb5..6d4ca4416a 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -202,6 +202,12 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
         PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
     }
 
+    @Override
+    public void onTimeout(int startId) {
+        Log.e(new Throwable("onTimeout"));
+        stopSelf(startId);
+    }
+
     @Override
     public void onDestroy() {
         EntityLog.log(this, "Service send destroy");
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index fb64f9c45e..d342310506 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1177,6 +1177,12 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
         return START_STICKY;
     }
 
+    @Override
+    public void onTimeout(int startId) {
+        Log.e(new Throwable("onTimeout"));
+        stopSelf(startId);
+    }
+
     private void onEnable(Intent intent) {
         boolean enabled = intent.getBooleanExtra("enabled", true);
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);