diff --git a/src/foss/AndroidManifest.xml b/src/foss/AndroidManifest.xml
new file mode 100644
index 000000000..498c668a4
--- /dev/null
+++ b/src/foss/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
+
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+
+  <application>
+    <service
+        android:name=".connect.KeepAliveService"
+        android:foregroundServiceType="specialUse"
+        android:enabled="true" />
+  </application>
+
+</manifest>
diff --git a/src/gplay/AndroidManifest.xml b/src/gplay/AndroidManifest.xml
index 22bb5c9ac..b0d786db4 100644
--- a/src/gplay/AndroidManifest.xml
+++ b/src/gplay/AndroidManifest.xml
@@ -10,6 +10,11 @@
   <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
 
   <application>
+    <service
+        android:name=".connect.KeepAliveService"
+        android:foregroundServiceType="dataSync"
+        android:enabled="true" />
+
     <service
         android:name=".notifications.FcmReceiveService"
         android:foregroundServiceType="dataSync"
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b33753672..63b148b88 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -388,11 +388,6 @@
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
     </activity>
 
-    <service
-        android:name=".connect.KeepAliveService"
-        android:foregroundServiceType="dataSync"
-        android:enabled="true" />
-
     <service
         android:name=".geolocation.LocationBackgroundService"
         android:foregroundServiceType="location" />
diff --git a/src/main/java/org/thoughtcrime/securesms/connect/KeepAliveService.java b/src/main/java/org/thoughtcrime/securesms/connect/KeepAliveService.java
index c6929ce95..5df275592 100644
--- a/src/main/java/org/thoughtcrime/securesms/connect/KeepAliveService.java
+++ b/src/main/java/org/thoughtcrime/securesms/connect/KeepAliveService.java
@@ -77,11 +77,17 @@ public class KeepAliveService extends Service {
         return null;
     }
 
+    @Override
     public void onDestroy() {
         Log.i("DeltaChat", "*** KeepAliveService.onDestroy()");
         // the service will be restarted due to START_STICKY automatically, there's nothing more to do.
     }
 
+    @Override
+    public void onTimeout(int startId, int fgsType) {
+        stopSelf();
+    }
+
     static public KeepAliveService getInstance()
     {
         return s_this; // may be null