diff --git a/android/src/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/src/app/organicmaps/DownloadResourcesLegacyActivity.java
index a179309861..8337818d63 100644
--- a/android/src/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/src/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -94,7 +94,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
       new Factory.KmzKmlProcessor(this),
   };
 
-  private final LocationListener mLocationListener = new LocationListener.Simple()
+  private final LocationListener mLocationListener = new LocationListener()
   {
     @Override
     public void onLocationUpdated(Location location)
diff --git a/android/src/app/organicmaps/location/LocationListener.java b/android/src/app/organicmaps/location/LocationListener.java
index 098a7432de..0c33ac4a10 100644
--- a/android/src/app/organicmaps/location/LocationListener.java
+++ b/android/src/app/organicmaps/location/LocationListener.java
@@ -6,16 +6,10 @@ import androidx.annotation.NonNull;
 
 public interface LocationListener
 {
-  class Simple implements LocationListener
-  {
-    @Override
-    public void onLocationUpdated(@NonNull Location location) {}
-
-    @Override
-    public void onCompassUpdated(double north) {}
-  }
-
   void onLocationUpdated(@NonNull Location location);
 
-  void onCompassUpdated(double north);
+  default void onCompassUpdated(double north)
+  {
+    // No op.
+  }
 }
diff --git a/android/src/app/organicmaps/routing/NavigationService.java b/android/src/app/organicmaps/routing/NavigationService.java
index 0ba7c11114..0a598f9c36 100644
--- a/android/src/app/organicmaps/routing/NavigationService.java
+++ b/android/src/app/organicmaps/routing/NavigationService.java
@@ -59,7 +59,7 @@ public class NavigationService extends Service
   private boolean mChangingConfiguration = false;
 
   @NonNull
-  private final LocationListener mLocationListener = new LocationListener.Simple()
+  private final LocationListener mLocationListener = new LocationListener()
   {
     @Override
     public void onLocationUpdated(Location location)
diff --git a/android/src/app/organicmaps/search/SearchFragment.java b/android/src/app/organicmaps/search/SearchFragment.java
index 617b973a67..222f7ff07f 100644
--- a/android/src/app/organicmaps/search/SearchFragment.java
+++ b/android/src/app/organicmaps/search/SearchFragment.java
@@ -168,7 +168,7 @@ public class SearchFragment extends BaseMwmFragment
   private String mInitialLocale;
   private boolean mInitialSearchOnMap = false;
 
-  private final LocationListener mLocationListener = new LocationListener.Simple()
+  private final LocationListener mLocationListener = new LocationListener()
   {
     @Override
     public void onLocationUpdated(Location location)