diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 76144ac40c..58ff3b17f2 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -395,7 +395,7 @@
         android:enabled="true" />
 
     <service
-        android:name=".geolocation.LocationBackgroundService"
+        android:name=".geolocation.LocationStreamingService"
         android:foregroundServiceType="location" />
 
     <service
diff --git a/src/main/java/org/thoughtcrime/securesms/geolocation/DcLocationManager.java b/src/main/java/org/thoughtcrime/securesms/geolocation/DcLocationManager.java
index 2baec0d992..3664432679 100644
--- a/src/main/java/org/thoughtcrime/securesms/geolocation/DcLocationManager.java
+++ b/src/main/java/org/thoughtcrime/securesms/geolocation/DcLocationManager.java
@@ -44,15 +44,12 @@ public DcLocationManager(Context context) {
         this.context = context.getApplicationContext();
         DcLocation.getInstance().addObserver(this);
         if (DcHelper.getContext(context).isSendingLocationsToChat(0)) {
-            startLocationEngine();
+            //startLocationEngine();
         }
     }
 
     public void startLocationEngine() {
-        if (serviceBinder == null) {
-            Intent intent = new Intent(context.getApplicationContext(), LocationBackgroundService.class);
-            context.bindService(intent, serviceConnection, BIND_AUTO_CREATE);
-        }
+        LocationStreamingService.startForegroundService(context.getApplicationContext());
     }
 
     public void stopLocationEngine() {
diff --git a/src/main/java/org/thoughtcrime/securesms/geolocation/LocationBackgroundService.java b/src/main/java/org/thoughtcrime/securesms/geolocation/LocationBackgroundService.java
deleted file mode 100644
index 05ae2409e5..0000000000
--- a/src/main/java/org/thoughtcrime/securesms/geolocation/LocationBackgroundService.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.thoughtcrime.securesms.geolocation;
-
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Binder;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.util.Log;
-
-public class LocationBackgroundService extends Service {
-
-    private static final int INITIAL_TIMEOUT = 1000 * 60 * 2;
-    private static final String TAG = LocationBackgroundService.class.getSimpleName();
-    private LocationManager locationManager = null;
-    private static final int LOCATION_INTERVAL = 1000;
-    private static final float LOCATION_DISTANCE = 25F;
-    ServiceLocationListener locationListener;
-
-    private final IBinder mBinder = new LocationBackgroundServiceBinder();
-
-    @Override
-    public boolean bindService(Intent service, ServiceConnection conn, int flags) {
-        return super.bindService(service, conn, flags);
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
-    @Override
-    public void onCreate() {
-        locationManager = (LocationManager) getApplicationContext().getSystemService(Context.LOCATION_SERVICE);
-        if (locationManager == null) {
-            Log.e(TAG, "Unable to initialize location service");
-            return;
-        }
-
-        locationListener = new ServiceLocationListener();
-        Location lastLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-        if (lastLocation != null) {
-          long locationAge = System.currentTimeMillis() - lastLocation.getTime();
-          if (locationAge <= 600 * 1000) { // not older than 10 minutes
-            DcLocation.getInstance().updateLocation(lastLocation);
-          }
-        }
-        //requestLocationUpdate(LocationManager.NETWORK_PROVIDER);
-        requestLocationUpdate(LocationManager.GPS_PROVIDER);
-        initialLocationUpdate();
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        super.onStartCommand(intent, flags, startId);
-        return START_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        if (locationManager == null) {
-            return;
-        }
-
-        try {
-            locationManager.removeUpdates(locationListener);
-        } catch (Exception ex) {
-            Log.i(TAG, "fail to remove location listeners, ignore", ex);
-        }
-    }
-
-    private void requestLocationUpdate(String provider) {
-        try {
-            locationManager.requestLocationUpdates(
-                    provider, LOCATION_INTERVAL, LOCATION_DISTANCE,
-                    locationListener);
-        } catch (SecurityException | IllegalArgumentException  ex) {
-            Log.e(TAG, String.format("Unable to request %s provider based location updates.", provider), ex);
-        }
-    }
-
-    private void initialLocationUpdate() {
-        try {
-            Location gpsLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-            if (gpsLocation != null && System.currentTimeMillis() - gpsLocation.getTime() < INITIAL_TIMEOUT) {
-              locationListener.onLocationChanged(gpsLocation);
-            }
-
-        } catch (NullPointerException | SecurityException e) {
-            e.printStackTrace();
-        }
-    }
-
-    class LocationBackgroundServiceBinder extends Binder {
-        LocationBackgroundServiceBinder getService() {
-            return LocationBackgroundServiceBinder.this;
-        }
-
-        void stop() {
-            DcLocation.getInstance().reset();
-            stopSelf();
-        }
-    }
-
-    private class ServiceLocationListener implements LocationListener {
-
-        @Override
-        public void onLocationChanged(Location location) {
-            Log.d(TAG, "onLocationChanged: " + location);
-            if (location == null) {
-                return;
-            }
-            DcLocation.getInstance().updateLocation(location);
-        }
-
-        @Override
-        public void onProviderDisabled(String provider) {
-            Log.e(TAG, "onProviderDisabled: " + provider);
-        }
-
-        @Override
-        public void onProviderEnabled(String provider) {
-            Log.e(TAG, "onProviderEnabled: " + provider);
-        }
-
-        @Override
-        public void onStatusChanged(String provider, int status, Bundle extras) {
-            Log.e(TAG, "onStatusChanged: " + provider + " status: " + status);
-        }
-    }
-
-}
diff --git a/src/main/java/org/thoughtcrime/securesms/geolocation/LocationStreamingService.java b/src/main/java/org/thoughtcrime/securesms/geolocation/LocationStreamingService.java
new file mode 100644
index 0000000000..cf53704096
--- /dev/null
+++ b/src/main/java/org/thoughtcrime/securesms/geolocation/LocationStreamingService.java
@@ -0,0 +1,171 @@
+package org.thoughtcrime.securesms.geolocation;
+
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresPermission;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
+
+import org.thoughtcrime.securesms.R;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class LocationStreamingService extends Service {
+
+  private static final String TAG = LocationStreamingService.class.getSimpleName();
+  private static final int INITIAL_TIMEOUT = 1000 * 60 * 2;
+  private LocationManager locationManager = null;
+  private static final int LOCATION_INTERVAL = 1000;
+  private static final float LOCATION_DISTANCE = 25F;
+  ServiceLocationListener locationListener;
+
+  private static final String CHANNEL_ID = "LOCATION";
+  private static final int NOTIFICATION_ID = 280125;
+  private static final AtomicBoolean CHANNEL_CREATED = new AtomicBoolean(false);
+
+  @RequiresPermission(value = ACCESS_FINE_LOCATION)
+  public static void startForegroundService(@NonNull Context context) {
+    createNotificationChannel(context);
+    Intent intent = new Intent(context, LocationStreamingService.class);
+    ContextCompat.startForegroundService(context, intent);
+  }
+
+  public static void stopService(@NonNull Context context) {
+    context.stopService(new Intent(context, LocationStreamingService.class));
+  }
+
+  @Nullable
+  @Override
+  public IBinder onBind(Intent intent) {
+    return null;
+  }
+
+  @Override
+  public void onCreate() {
+    locationManager = (LocationManager) getApplicationContext().getSystemService(Context.LOCATION_SERVICE);
+    if (locationManager == null) {
+      Log.e(TAG, "Unable to initialize location service");
+      return;
+    }
+
+    locationListener = new ServiceLocationListener();
+    Location lastLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+    if (lastLocation != null) {
+      long locationAge = System.currentTimeMillis() - lastLocation.getTime();
+      if (locationAge <= 600 * 1000) { // not older than 10 minutes
+        DcLocation.getInstance().updateLocation(lastLocation);
+      }
+    }
+    //requestLocationUpdate(LocationManager.NETWORK_PROVIDER);
+    requestLocationUpdate(LocationManager.GPS_PROVIDER);
+    initialLocationUpdate();
+  }
+
+  @Override
+  public int onStartCommand(Intent intent, int flags, int startId) {
+    Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
+      .setContentTitle(getString(R.string.pref_on_demand_location_streaming))
+      .setSmallIcon(R.drawable.notification_permanent)
+      .build();
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      startForeground(NOTIFICATION_ID, notification, FOREGROUND_SERVICE_TYPE_LOCATION);
+    } else {
+      startForeground(NOTIFICATION_ID, notification);
+    }
+
+    return START_STICKY;
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+
+    if (locationManager == null) {
+      return;
+    }
+
+    try {
+      locationManager.removeUpdates(locationListener);
+    } catch (Exception ex) {
+      Log.i(TAG, "fail to remove location listeners, ignore", ex);
+    }
+  }
+
+  private void requestLocationUpdate(String provider) {
+    try {
+      locationManager.requestLocationUpdates(
+                                             provider, LOCATION_INTERVAL, LOCATION_DISTANCE,
+                                             locationListener);
+    } catch (SecurityException | IllegalArgumentException  ex) {
+      Log.e(TAG, String.format("Unable to request %s provider based location updates.", provider), ex);
+    }
+  }
+
+  private void initialLocationUpdate() {
+    try {
+      Location gpsLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+      if (gpsLocation != null && System.currentTimeMillis() - gpsLocation.getTime() < INITIAL_TIMEOUT) {
+        locationListener.onLocationChanged(gpsLocation);
+      }
+
+    } catch (NullPointerException | SecurityException e) {
+      e.printStackTrace();
+    }
+  }
+
+  static public void createNotificationChannel(Context context) {
+    if(!CHANNEL_CREATED.get() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      CHANNEL_CREATED.set(true);
+      NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
+              "Location Streaming Service", NotificationManager.IMPORTANCE_MIN);
+      channel.setDescription("Ensure app will not be killed while location is being streamed in background.");
+      NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+      notificationManager.createNotificationChannel(channel);
+    }
+  }
+
+  private class ServiceLocationListener implements LocationListener {
+
+    @Override
+    public void onLocationChanged(Location location) {
+      Log.d(TAG, "onLocationChanged: " + location);
+      if (location == null) {
+        return;
+      }
+      DcLocation.getInstance().updateLocation(location);
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
+      Log.e(TAG, "onProviderDisabled: " + provider);
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+      Log.e(TAG, "onProviderEnabled: " + provider);
+    }
+
+    @Override
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+      Log.e(TAG, "onStatusChanged: " + provider + " status: " + status);
+    }
+  }
+
+}
diff --git a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 77bd46add4..25aa73db5e 100644
--- a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -503,11 +503,7 @@ public static void selectLocation(Activity activity, int chatId) {
                 }
               });
             });
-    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
-      permissionsBuilder.request(Manifest.permission.ACCESS_BACKGROUND_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION);
-    } else {
-      permissionsBuilder.request(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION);
-    }
+    permissionsBuilder.request(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION);
     permissionsBuilder.execute();
   }
 
diff --git a/src/main/java/org/thoughtcrime/securesms/service/FetchForegroundService.java b/src/main/java/org/thoughtcrime/securesms/service/FetchForegroundService.java
index 3415596633..a1f0b2e26f 100644
--- a/src/main/java/org/thoughtcrime/securesms/service/FetchForegroundService.java
+++ b/src/main/java/org/thoughtcrime/securesms/service/FetchForegroundService.java
@@ -14,12 +14,11 @@
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.connect.ForegroundDetector;
-import org.thoughtcrime.securesms.notifications.FcmReceiveService;
 import org.thoughtcrime.securesms.notifications.NotificationCenter;
 import org.thoughtcrime.securesms.util.Util;
 
 public final class FetchForegroundService extends Service {
-  private static final String TAG = FcmReceiveService.class.getSimpleName();
+  private static final String TAG = FetchForegroundService.class.getSimpleName();
   private static final Object SERVICE_LOCK = new Object();
   private static final Object STOP_NOTIFIER = new Object();
   private static volatile boolean fetchingSynchronously = false;