diff --git a/src/main/java/com/owncloud/android/ui/activity/Preferences.java b/src/main/java/com/owncloud/android/ui/activity/Preferences.java
index a4844dd096..a9b17f08e2 100644
--- a/src/main/java/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/main/java/com/owncloud/android/ui/activity/Preferences.java
@@ -335,9 +335,12 @@ public class Preferences extends PreferenceActivity
                     if (mExpertMode.isChecked()) {
                         Log_OC.startLogging(getApplicationContext());
                     } else {
-                        Log_OC.stopLogging();
+                        if (!BuildConfig.DEBUG &&
+                                !getApplicationContext().getResources().getBoolean(R.bool.logger_enabled)) {
+                            Log_OC.stopLogging();
+                        }
                     }
-                    
+
                     return true;
                 }
             });