diff --git a/android/flavors/gms-enabled/com/mapswithme/maps/location/GoogleFusedLocationProvider.java b/android/flavors/gms-enabled/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
index 1d80541812..e7d78d0d8b 100644
--- a/android/flavors/gms-enabled/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
+++ b/android/flavors/gms-enabled/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
@@ -75,6 +75,9 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
     final LocationRequest locationRequest = LocationRequest.create();
     locationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
     locationRequest.setInterval(interval);
+    // Wait a few seconds for accurate locations initially, when accurate locations could not be computed on the device immediately.
+    // https://github.com/organicmaps/organicmaps/issues/2149
+    locationRequest.setWaitForAccurateLocation(true);
     LOGGER.d(TAG, "Request Google fused provider to provide locations at this interval = "
         + interval + " ms");
     locationRequest.setFastestInterval(interval / 2);