diff --git a/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java b/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java
index fd57571391..05b011a14a 100644
--- a/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java
@@ -7,6 +7,7 @@ import android.preference.TwoStatePreference;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
+import com.mapswithme.maps.BuildConfig;
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.location.LocationHelper;
@@ -71,7 +72,8 @@ public class MiscPrefsFragment extends BaseXmlSettingsFragment
       getPreferenceScreen().removePreference(findPreference(getString(R.string.pref_showcase_switched_on)));
 
     pref = findPreference(getString(R.string.pref_enable_logging));
-    if (!MwmApplication.prefs().getBoolean(SearchFragment.PREFS_SHOW_ENABLE_LOGGING_SETTING, false))
+    if (!MwmApplication.prefs().getBoolean(SearchFragment.PREFS_SHOW_ENABLE_LOGGING_SETTING,
+                                           BuildConfig.BUILD_TYPE.equals("beta")))
     {
       getPreferenceScreen().removePreference(pref);
     }
diff --git a/android/src/com/mapswithme/util/log/LoggerFactory.java b/android/src/com/mapswithme/util/log/LoggerFactory.java
index 16b8f603ca..3db3e5abf5 100644
--- a/android/src/com/mapswithme/util/log/LoggerFactory.java
+++ b/android/src/com/mapswithme/util/log/LoggerFactory.java
@@ -52,7 +52,8 @@ public class LoggerFactory
   public boolean isFileLoggingEnabled()
   {
     SharedPreferences prefs = MwmApplication.prefs();
-    return prefs.getBoolean(MwmApplication.get().getString(R.string.pref_enable_logging), false);
+    String enableLoggingKey = MwmApplication.get().getString(R.string.pref_enable_logging);
+    return prefs.getBoolean(enableLoggingKey, BuildConfig.BUILD_TYPE.equals("beta"));
   }
 
   public void setFileLoggingEnabled(boolean enabled)
@@ -110,9 +111,7 @@ public class LoggerFactory
   @NonNull
   private LoggerStrategy createLoggerStrategy(@NonNull Type type)
   {
-    SharedPreferences prefs = MwmApplication.prefs();
-    String enableLoggingKey = MwmApplication.get().getString(R.string.pref_enable_logging);
-    if (prefs.getBoolean(enableLoggingKey, BuildConfig.BUILD_TYPE.equals("beta")))
+    if (isFileLoggingEnabled())
     {
       String logsFolder = StorageUtils.getLogsFolder();
       if (!TextUtils.isEmpty(logsFolder))