diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 2344ea6..bb4a971 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,18 +3,13 @@
 
     <uses-feature android:name="android.hardware.touchscreen"
         android:required="false" />
-
-    <!-- The INTERNET permission is required for development. Specifically,
-         flutter needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
+
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/lib/managers/location_manager.class.dart b/lib/managers/location_manager.class.dart
index 3092018..3868337 100644
--- a/lib/managers/location_manager.class.dart
+++ b/lib/managers/location_manager.class.dart
@@ -27,6 +27,7 @@ class LocationManager {
     _isRunning = prefs.getBool("location-enabled") ?? false;
     if (_isRunning) {
       await _startLocationService();
+      updateDeviceLocation(false);
     }
   }
 
@@ -107,58 +108,46 @@ class LocationManager {
     await workManager.Workmanager.cancelByTag(backgroundTaskTag);
   }
 
-  updateDeviceLocation() async {
-    Logger.d("[Test location] Started");
-    Logger.d("[Test location] Forcing Android location manager...");
+  updateDeviceLocation(bool force) async {
+    if (!force && !_isRunning) {
+      Logger.d("[Foreground location] Not enabled. Aborting.");
+      return;
+    }
+    Logger.d("[Foreground location] Started");
+    //Logger.d("[Foreground location] Forcing Android location manager...");
     Geolocator geolocator = Geolocator()..forceAndroidLocationManager = true;
     var battery = Battery();
-    int batteryLevel = 100;
     String webhookId = ConnectionManager().webhookId;
     String httpWebHost = ConnectionManager().httpWebHost;
     if (webhookId != null && webhookId.isNotEmpty) {
-        String url = "$httpWebHost/api/webhook/$webhookId";
-        Map<String, String> headers = {};
-        headers["Content-Type"] = "application/json";
-        Map data = {
-          "type": "update_location",
-          "data": {
-            "gps": [],
-            "gps_accuracy": 0,
-            "battery": batteryLevel
-          }
-        };
-        Logger.d("[Test location] Getting battery level...");
-        battery.batteryLevel.then((val) => data["data"]["battery"] = val).whenComplete((){
-          Logger.d("[Test location] Getting device location...");
-          geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high, locationPermissionLevel: GeolocationPermission.locationAlways).then((location) {
-            Logger.d("[Test location] Got location: ${location.latitude} ${location.longitude} with accuracy of ${location.accuracy}");
-            if (location != null) {
-              data["data"]["gps"] = [location.latitude, location.longitude];
-              data["data"]["gps_accuracy"] = location.accuracy;
-              Logger.d("[Test location] Sending data home...");
-              http.post(
-                  url,
-                  headers: headers,
-                  body: json.encode(data)
-              );
+        Logger.d("[Foreground location] Getting battery level...");
+        int batteryLevel = await battery.batteryLevel;
+        Logger.d("[Foreground location] Getting device location...");
+        Position position = await geolocator.getCurrentPosition(
+            desiredAccuracy: LocationAccuracy.high,
+            locationPermissionLevel: GeolocationPermission.locationAlways
+          );
+        if (position != null) {
+          Logger.d("[Foreground location] Location: ${position.latitude} ${position.longitude}. Accuracy: ${position.accuracy}. (${position.timestamp})");
+          String url = "$httpWebHost/api/webhook/$webhookId";
+          Map data = {
+            "type": "update_location",
+            "data": {
+              "gps": [position.latitude, position.longitude],
+              "gps_accuracy": position.accuracy,
+              "battery": batteryLevel ?? 100
             }
-          }).catchError((e) {
-            Logger.d("[Test location] Error getting current location: ${e.toString()}. Trying last known...");
-            geolocator.getLastKnownPosition(desiredAccuracy: LocationAccuracy.medium).then((location){
-              Logger.d("[Test location] Got last known location: ${location.latitude} ${location.longitude} with accuracy of ${location.accuracy}");
-              if (location != null) {
-                data["data"]["gps"] = [location.latitude, location.longitude];
-                data["data"]["gps_accuracy"] = location.accuracy;
-                Logger.d("[Test location] Sending data home...");
-                http.post(
-                  url,
-                  headers: headers,
-                  body: json.encode(data)
-                );
-              }
-            });
-          });
-        });
+          };
+          Logger.d("[Foreground location] Sending data home...");
+          var response = await http.post(
+            url,
+            headers: {"Content-Type": "application/json"},
+            body: json.encode(data)
+          );
+          Logger.d("[Foreground location] Got HTTP ${response.statusCode}");
+        } else {
+          Logger.d("[Foreground location] No location. Aborting.");
+        }
     }
   }
 
diff --git a/lib/pages/integration_settings.page.dart b/lib/pages/integration_settings.page.dart
index a65abee..9b51e6c 100644
--- a/lib/pages/integration_settings.page.dart
+++ b/lib/pages/integration_settings.page.dart
@@ -94,7 +94,7 @@ class _IntegrationSettingsPageState extends State<IntegrationSettingsPage> {
 
   _switchLocationTrackingState(bool state) async {
     if (state) {
-      await LocationManager().updateDeviceLocation();
+      await LocationManager().updateDeviceLocation(true);
     }
     await LocationManager().setSettings(_locationTrackingEnabled, _locationInterval);
     setState(() {
diff --git a/lib/pages/main.page.dart b/lib/pages/main.page.dart
index e363411..d0d9e2a 100644
--- a/lib/pages/main.page.dart
+++ b/lib/pages/main.page.dart
@@ -122,6 +122,7 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
     _showInfoBottomBar(progress: true,);
     ConnectionManager().init(loadSettings: false, forceReconnect: false).then((_){
       _fetchData();
+      LocationManager().updateDeviceLocation(false);
       //StartupUserMessagesManager().checkMessagesToShow();
     }, onError: (e) {
       _setErrorState(e);
diff --git a/pubspec.yaml b/pubspec.yaml
index dd873f9..c694441 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -26,7 +26,7 @@ dependencies:
   flutter_secure_storage: ^3.3.1+1
   device_info: ^0.4.0+3
   flutter_local_notifications: ^0.8.4
-  geolocator: ^5.1.4+2
+  geolocator: ^5.1.5
   workmanager: ^0.1.3
   battery: ^0.3.1+1
   share: