diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 05b421b5f4..00b3ee40fd 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -670,6 +670,9 @@
 	<string name="enable_screen_sleep">Дазволіць экрану засынаць</string>
 	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Дазваляе экрану засынаць пасля перыяда бездзеяння.</string>
+	<string name="enable_show_on_lock_screen">Паказваць Organic Maps на экране блакіроўкі</string>
+	<!-- Description in preferences -->
+	<string name="enable_show_on_lock_screen_description">Калі ўключана, вам не трэба разблакіраваць прыладу кожны раз падчас працы дадатку.</string>
 
 	<!-- SECTION: Types -->
 	<string name="type.amenity.fire_station">Пажарная частка</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 1b8e80db94..50f2572102 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -662,6 +662,9 @@
 	<string name="enable_screen_sleep">Pozwól ekranowi spać</string>
 	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Po włączeniu ekran będzie mógł spać po okresie bezczynności.</string>
+	<string name="enable_show_on_lock_screen">Pokazuj Organic Maps na ekranie blokady</string>
+	<!-- Description in preferences -->
+	<string name="enable_show_on_lock_screen_description">Po włączeniu nie musisz odblokowywać urządzenia za każdym razem, gdy aplikacja jest uruchomiona.</string>
 
 	<!-- SECTION: Types -->
 	<string name="type.aerialway">Transport linowy</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 0abb799814..1a068b0559 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -680,6 +680,9 @@
 	<string name="enable_screen_sleep">Разрешить экрану спать</string>
 	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">При включении экран может переходить в спящий режим после периода бездействия.</string>
+	<string name="enable_show_on_lock_screen">Показывать Organic Maps на экране блокировки</string>
+	<!-- Description in preferences -->
+	<string name="enable_show_on_lock_screen_description">Если эта функция включена, вам не нужно каждый раз разблокировать устройство во время работы приложения.</string>
 
 	<!-- SECTION: Types -->
 	<string name="type.aerialway">Канатная дорога</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 9cdec9d772..b74122f1cb 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -663,6 +663,9 @@
 	<string name="enable_screen_sleep">Дозволити екрану вимкнутись</string>
 	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">При включенні екран може переходити в сплячий режим після певного періоду бездіяльності</string>
+	<string name="enable_show_on_lock_screen">Показувати Organic Maps на заблокованому екрані</string>
+	<!-- Description in preferences -->
+	<string name="enable_show_on_lock_screen_description">Якщо ввімкнено, вам не потрібно щоразу розблоковувати пристрій під час роботи програми.</string>
 
 	<!-- SECTION: Types -->
 	<string name="type.aerialway">Канатна дорога</string>
diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index a0235e33b0..0cc1e1741d 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -38,6 +38,7 @@
   <string name="pref_transliteration" translatable="false">Transliteration</string>
   <string name="pref_power_management" translatable="false">PowerManagment</string>
   <string name="pref_screen_sleep" translatable="false">ScreenSleep</string>
+  <string name="pref_show_on_lock_screen" translatable="false">ShowOnLockScreen</string>
 
   <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
   <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 9c412c4842..78188be2a2 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -694,6 +694,9 @@
 	<string name="enable_screen_sleep">Allow screen to sleep</string>
 	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">When enabled the screen will be allowed to sleep after a period of inactivity.</string>
+	<string name="enable_show_on_lock_screen">Show Organic Maps on the lock screen</string>
+	<!-- Description in preferences -->
+	<string name="enable_show_on_lock_screen_description">When enabled, you don\'t need to unlock your device every time while the app is running.</string>
 
 	<!-- SECTION: Types -->
 	<string name="type.aerialway">Aerialway</string>
diff --git a/android/res/xml/prefs_main.xml b/android/res/xml/prefs_main.xml
index 4b64e686c9..a318bbf5ea 100644
--- a/android/res/xml/prefs_main.xml
+++ b/android/res/xml/prefs_main.xml
@@ -76,6 +76,13 @@
       android:summary="@string/enable_screen_sleep_description"
       android:defaultValue="false"
       android:order="16"/>
+
+    <SwitchPreferenceCompat
+        android:key="@string/pref_show_on_lock_screen"
+        android:title="@string/enable_show_on_lock_screen"
+        android:summary="@string/enable_show_on_lock_screen_description"
+        android:defaultValue="false"
+        android:order="17"/>
   </androidx.preference.PreferenceCategory>
 
   <androidx.preference.PreferenceCategory
diff --git a/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java b/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java
index 19faff6f88..2dcb963567 100644
--- a/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java
+++ b/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java
@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
 
 import com.mapswithme.util.Config;
 import com.mapswithme.util.CrashlyticsUtils;
+import com.mapswithme.util.Utils;
 import com.mapswithme.util.ViewServer;
 import com.mapswithme.util.concurrency.UiThread;
 import com.mapswithme.util.log.Logger;
@@ -77,6 +78,7 @@ public class BaseActivityDelegate
   {
     logLifecycleMethod("onResume()");
     ViewServer.get(mActivity.get()).setFocusedWindow(mActivity.get());
+    Utils.showOnLockScreen(Config.isShowOnLockScreenEnabled(), mActivity.get());
   }
 
   public void onPause()
diff --git a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
index b797564d04..7b758dbaa1 100644
--- a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
@@ -311,6 +311,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
         mPreferenceScreen.removePreference(tracking);
     }
     initScreenSleepEnabledPrefsCallbacks();
+    initShowOnLockScreenPrefsCallbacks();
     updateTts();
   }
 
@@ -318,6 +319,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   {
     String key = getString(R.string.pref_speed_cameras);
     final ListPreference pref = findPreference(key);
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
     pref.setSummary(pref.getEntry());
@@ -412,6 +414,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initLargeFontSizePrefsCallbacks()
   {
     Preference pref = findPreference(getString(R.string.pref_large_fonts_size));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -434,6 +437,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initTransliterationPrefsCallbacks()
   {
     Preference pref = findPreference(getString(R.string.pref_transliteration));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -502,6 +506,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initLoggingEnabledPrefsCallbacks()
   {
     Preference pref = findPreference(getString(R.string.pref_enable_logging));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -520,6 +525,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initEmulationBadStorage()
   {
     Preference pref = findPreference(getString(R.string.pref_emulate_bad_external_storage));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -530,6 +536,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initAutoZoomPrefsCallbacks()
   {
     final TwoStatePreference pref = findPreference(getString(R.string.pref_auto_zoom));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -549,6 +556,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private boolean initPlayServicesPrefsCallbacks()
   {
     Preference pref = findPreference(getString(R.string.pref_play_services));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return false;
 
@@ -582,6 +590,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void init3dModePrefsCallbacks()
   {
     final TwoStatePreference pref = findPreference(getString(R.string.pref_3d_buildings));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -604,6 +613,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initPerspectivePrefsCallbacks()
   {
     final TwoStatePreference pref = findPreference(getString(R.string.pref_3d));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -626,6 +636,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initAutoDownloadPrefsCallbacks()
   {
     TwoStatePreference pref = findPreference(getString(R.string.pref_autodownload));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -649,6 +660,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initMapStylePrefsCallbacks()
   {
     final ListPreference pref = findPreference(getString(R.string.pref_map_style));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -676,6 +688,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initZoomPrefsCallbacks()
   {
     Preference pref = findPreference(getString(R.string.pref_show_zoom_buttons));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -694,6 +707,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initMeasureUnitsPrefsCallbacks()
   {
     Preference pref = findPreference(getString(R.string.pref_munits));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -739,6 +753,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   {
     String key = getString(R.string.pref_crash_reports);
     Preference pref = findPreference(key);
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return false;
 
@@ -756,6 +771,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
   private void initScreenSleepEnabledPrefsCallbacks()
   {
     Preference pref = findPreference(getString(R.string.pref_screen_sleep));
+    // TODO: check whether it's needed #2049
     if (pref == null)
       return;
 
@@ -772,9 +788,32 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
         });
   }
 
+  private void initShowOnLockScreenPrefsCallbacks()
+  {
+    Preference pref = findPreference(getString(R.string.pref_show_on_lock_screen));
+    // TODO: check whether it's needed #2049
+    if (pref == null)
+      return;
+
+    final boolean isShowOnLockScreenEnabled = Config.isShowOnLockScreenEnabled();
+    ((TwoStatePreference) pref).setChecked(isShowOnLockScreenEnabled);
+    pref.setOnPreferenceChangeListener(
+            (preference, newValue) ->
+            {
+              boolean newVal = (Boolean) newValue;
+              if (isShowOnLockScreenEnabled != newVal)
+              {
+                Config.setShowOnLockScreenEnabled(newVal);
+                Utils.showOnLockScreen(newVal, getActivity());
+              }
+              return true;
+            });
+  }
+
   private void removePreference(@NonNull String categoryKey, @NonNull Preference preference)
   {
     PreferenceCategory category = findPreference(categoryKey);
+    // TODO: check whether it's needed #2049
     if (category == null)
       return;
 
diff --git a/android/src/com/mapswithme/util/Config.java b/android/src/com/mapswithme/util/Config.java
index aec882d311..d902eb1ebf 100644
--- a/android/src/com/mapswithme/util/Config.java
+++ b/android/src/com/mapswithme/util/Config.java
@@ -39,6 +39,7 @@ public final class Config
   private static final String KEY_MISC_USE_MOBILE_DATA_ROAMING = "UseMobileDataRoaming";
   private static final String KEY_MISC_AD_FORBIDDEN = "AdForbidden";
   private static final String KEY_MISC_ENABLE_SCREEN_SLEEP = "EnableScreenSleep";
+  private static final String KEY_MISC_SHOW_ON_LOCK_SCREEN = "ShowOnLockScreen";
 
   private Config() {}
 
@@ -186,6 +187,16 @@ public final class Config
     setBool(KEY_MISC_ENABLE_SCREEN_SLEEP, enabled);
   }
 
+  public static boolean isShowOnLockScreenEnabled()
+  {
+    return getBool(KEY_MISC_SHOW_ON_LOCK_SCREEN, false);
+  }
+
+  public static void setShowOnLockScreenEnabled(boolean enabled)
+  {
+    setBool(KEY_MISC_SHOW_ON_LOCK_SCREEN, enabled);
+  }
+
   public static boolean useGoogleServices()
   {
     return getBool(KEY_PREF_USE_GS, true);
diff --git a/android/src/com/mapswithme/util/Utils.java b/android/src/com/mapswithme/util/Utils.java
index f5ae471c3c..dc9aca68aa 100644
--- a/android/src/com/mapswithme/util/Utils.java
+++ b/android/src/com/mapswithme/util/Utils.java
@@ -18,6 +18,7 @@ import android.text.style.AbsoluteSizeSpan;
 import android.util.AndroidRuntimeException;
 import android.view.View;
 import android.view.Window;
+import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -100,6 +101,16 @@ public class Utils
       w.clearFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
   }
 
+  public static void showOnLockScreen(boolean enable, Activity activity)
+  {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
+      activity.setShowWhenLocked(enable);
+    else if (enable)
+      activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+    else
+      activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+  }
+
   public static void showSnackbar(@NonNull View view, @NonNull String message)
   {
     Snackbar snackbar = Snackbar.make(view, message, Snackbar.LENGTH_LONG);
diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index b2cc29f536..fec2b3fb57 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -21759,6 +21759,23 @@
     zh-Hans = 启用后，屏幕将在一段时间不活动后进入休眠状态。
     zh-Hant = 啟用後，螢幕將在一段時間不活動後進入休眠狀態。
 
+  [enable_show_on_lock_screen]
+    tags = android
+    en = Show Organic Maps on the lock screen
+    be = Паказваць Organic Maps на экране блакіроўкі
+    pl = Pokazuj Organic Maps na ekranie blokady
+    ru = Показывать Organic Maps на экране блокировки
+    uk = Показувати Organic Maps на заблокованому екрані
+
+  [enable_show_on_lock_screen_description]
+    tags = android
+    comment = Description in preferences
+    en = When enabled, you don't need to unlock your device every time while the app is running.
+    be = Калі ўключана, вам не трэба разблакіраваць прыладу кожны раз падчас працы дадатку.
+    pl = Po włączeniu nie musisz odblokowywać urządzenia za każdym razem, gdy aplikacja jest uruchomiona.
+    ru = Если эта функция включена, вам не нужно каждый раз разблокировать устройство во время работы приложения.
+    uk = Якщо ввімкнено, вам не потрібно щоразу розблоковувати пристрій під час роботи програми.
+
   [whats_new_auto_update_title]
     comment = Autoupdate dialog on start
     tags = ios