diff --git a/android/src/com/mapswithme/maps/background/WorkerService.java b/android/src/com/mapswithme/maps/background/WorkerService.java
index 5551ca0d26..77de9d460c 100644
--- a/android/src/com/mapswithme/maps/background/WorkerService.java
+++ b/android/src/com/mapswithme/maps/background/WorkerService.java
@@ -29,7 +29,7 @@ public class WorkerService extends IntentService
    *
    * @see IntentService
    */
-  public static void startActionCheckUpdate(Context context)
+  static void startActionCheckUpdate(Context context)
   {
     Intent intent = new Intent(context, WorkerService.class);
     intent.setAction(ACTION_CHECK_UPDATE);
@@ -42,7 +42,7 @@ public class WorkerService extends IntentService
    *
    * @see IntentService
    */
-  public static void startActionDownload(Context context)
+  static void startActionDownload(Context context)
   {
     final Intent intent = new Intent(context, WorkerService.class);
     intent.setAction(WorkerService.ACTION_DOWNLOAD_COUNTRY);
@@ -94,6 +94,9 @@ public class WorkerService extends IntentService
 
   private void handleActionCheckLocation()
   {
+    if (ActiveCountryTree.isLegacyMode())
+      return;
+
     final long delayMillis = 60000; // 60 seconds
     boolean isLocationValid = processLocation();
     if (!isLocationValid)
@@ -131,7 +134,7 @@ public class WorkerService extends IntentService
   /**
    * Adds notification with download country suggest.
    */
-  private void placeDownloadNotification(Location l)
+  private static void placeDownloadNotification(Location l)
   {
     final String country = Framework.nativeGetCountryNameIfAbsent(l.getLatitude(), l.getLongitude());
     if (!TextUtils.isEmpty(country))