diff --git a/FAQ.md b/FAQ.md
index 9650ecce53..9b98aad020 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -2166,27 +2166,27 @@ For more complex schemes you could set one or more accounts to manual synchroniz
 and send this command to FairEmail to check for new messages:
 
 ```
-(adb shell) am startservice -a eu.faircode.email.POLL
+(adb shell) am start-foreground-service -a eu.faircode.email.POLL
 ```
 
 For a specific account:
 
 ```
-(adb shell) am startservice -a eu.faircode.email.POLL --es account Gmail
+(adb shell) am start-foreground-service -a eu.faircode.email.POLL --es account Gmail
 ```
 
 You can also automate turning receiving messages on and off by sending these commands to FairEmail:
 
 ```
-(adb shell) am startservice -a eu.faircode.email.ENABLE
-(adb shell) am startservice -a eu.faircode.email.DISABLE
+(adb shell) am start-foreground-service -a eu.faircode.email.ENABLE
+(adb shell) am start-foreground-service -a eu.faircode.email.DISABLE
 ```
 
 To enable/disable a specific account:
 
 ```
-(adb shell) am startservice -a eu.faircode.email.ENABLE --es account Gmail
-(adb shell) am startservice -a eu.faircode.email.DISABLE --es account Gmail
+(adb shell) am start-foreground-service -a eu.faircode.email.ENABLE --es account Gmail
+(adb shell) am start-foreground-service -a eu.faircode.email.DISABLE --es account Gmail
 ```
 
 Note that disabling an account will hide the account and all associated folders and messages.
@@ -3426,7 +3426,7 @@ see [here](https://disconnect.me/trackerprotection#trackers-we-dont-block) for m
 This command can be sent to FairEmail from an automation app to update the protection lists:
 
 ```
-(adb shell) am startservice -a eu.faircode.email.DISCONNECT.ME
+(adb shell) am start-foreground-service -a eu.faircode.email.DISCONNECT.ME
 ```
 
 Updating once a week will probably be sufficient,
diff --git a/app/src/main/java/eu/faircode/email/ServiceExternal.java b/app/src/main/java/eu/faircode/email/ServiceExternal.java
index f8127e69b8..3883673360 100644
--- a/app/src/main/java/eu/faircode/email/ServiceExternal.java
+++ b/app/src/main/java/eu/faircode/email/ServiceExternal.java
@@ -43,10 +43,10 @@ public class ServiceExternal extends Service {
     private static final String ACTION_DISABLE = BuildConfig.APPLICATION_ID + ".DISABLE";
     private static final String ACTION_DISCONNECT_ME = BuildConfig.APPLICATION_ID + ".DISCONNECT.ME";
 
-    // adb shell am startservice -a eu.faircode.email.POLL --es account Gmail
-    // adb shell am startservice -a eu.faircode.email.ENABLE --es account Gmail
-    // adb shell am startservice -a eu.faircode.email.DISABLE --es account Gmail
-    // adb shell am startservice -a eu.faircode.email.DISCONNECT
+    // adb shell am start-foreground-service -a eu.faircode.email.POLL --es account Gmail
+    // adb shell am start-foreground-service -a eu.faircode.email.ENABLE --es account Gmail
+    // adb shell am start-foreground-service -a eu.faircode.email.DISABLE --es account Gmail
+    // adb shell am start-foreground-service -a eu.faircode.email.DISCONNECT
 
     private static final ExecutorService executor =
             Helper.getBackgroundExecutor(1, "external");