diff --git a/res/xml/prefs_screen_debug.xml b/res/xml/prefs_screen_debug.xml
index 98136b3d..4a2dcb7c 100644
--- a/res/xml/prefs_screen_debug.xml
+++ b/res/xml/prefs_screen_debug.xml
@@ -2,11 +2,13 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"  app:orderingFromXml="true">
 
 	<SwitchPreferenceCompat
+		app:defaultValue="false"
 		app:key="pref_enable_debug_logs"
 		app:layout="@layout/pref_switch"
 		app:title="@string/pref_debug_logs" />
 
 	<SwitchPreferenceCompat
+		app:defaultValue="false"
 		app:key="pref_enable_system_logs"
 		app:layout="@layout/pref_switch"
 		app:title="@string/pref_system_logs" />
diff --git a/res/xml/prefs_screen_setup.xml b/res/xml/prefs_screen_setup.xml
index 1e4a7ab2..a4fc1ea2 100644
--- a/res/xml/prefs_screen_setup.xml
+++ b/res/xml/prefs_screen_setup.xml
@@ -18,12 +18,14 @@
 		app:singleLineTitle="true">
 
 	<SwitchPreferenceCompat
+		app:defaultValue="false"
 		app:key="pref_alternative_suggestion_scrolling"
 		app:layout="@layout/pref_switch"
 		app:title="@string/pref_alternative_suggestion_scrolling"
 		app:summary="@string/pref_alternative_suggestion_scrolling_summary"/>
 
 	<SwitchPreferenceCompat
+		app:defaultValue="false"
 		app:key="pref_hack_fb_messenger"
 		app:layout="@layout/pref_switch"
 		app:title="@string/pref_hack_fb_messenger"
diff --git a/src/io/github/sspanak/tt9/Logger.java b/src/io/github/sspanak/tt9/Logger.java
index 37ecad97..c768105f 100644
--- a/src/io/github/sspanak/tt9/Logger.java
+++ b/src/io/github/sspanak/tt9/Logger.java
@@ -10,12 +10,8 @@ public class Logger {
 		return LEVEL == Log.DEBUG;
 	}
 
-	public static void setDebugLevel() {
-		LEVEL = Log.DEBUG;
-	}
-
-	public static void setDefaultLevel() {
-		LEVEL = Log.ERROR;
+	public static void enableDebugLevel(boolean yes) {
+		LEVEL = yes ? Log.DEBUG : Log.ERROR;
 	}
 
 	static public void v(String tag, String msg)  {
diff --git a/src/io/github/sspanak/tt9/ime/TraditionalT9.java b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
index 8658bd59..6c04979b 100644
--- a/src/io/github/sspanak/tt9/ime/TraditionalT9.java
+++ b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
@@ -214,6 +214,7 @@ public class TraditionalT9 extends KeyPadHandler {
 
 		initTyping();
 		initUi();
+		Logger.enableDebugLevel(settings.getDebugLogsEnabled());
 
 		isActive = true;
 	}
diff --git a/src/io/github/sspanak/tt9/preferences/PreferencesActivity.java b/src/io/github/sspanak/tt9/preferences/PreferencesActivity.java
index 8aa7db43..d90f7250 100644
--- a/src/io/github/sspanak/tt9/preferences/PreferencesActivity.java
+++ b/src/io/github/sspanak/tt9/preferences/PreferencesActivity.java
@@ -13,6 +13,7 @@ import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
+import io.github.sspanak.tt9.Logger;
 import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.db.DictionaryDb;
 import io.github.sspanak.tt9.db.DictionaryLoader;
@@ -38,6 +39,7 @@ public class PreferencesActivity extends AppCompatActivity implements Preference
 		globalKeyboardSettings = new GlobalKeyboardSettings(this, (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE));
 		settings = new SettingsStore(this);
 		applyTheme();
+		Logger.enableDebugLevel(settings.getDebugLogsEnabled());
 
 		DictionaryDb.init(this);
 		DictionaryDb.normalizeWordFrequencies(settings);
diff --git a/src/io/github/sspanak/tt9/preferences/SettingsStore.java b/src/io/github/sspanak/tt9/preferences/SettingsStore.java
index a681202d..467b2cb9 100644
--- a/src/io/github/sspanak/tt9/preferences/SettingsStore.java
+++ b/src/io/github/sspanak/tt9/preferences/SettingsStore.java
@@ -265,6 +265,8 @@ public class SettingsStore {
 
 	/************* internal settings *************/
 
+	public boolean getDebugLogsEnabled() { return prefs.getBoolean("pref_enable_debug_logs", Logger.isDebugLevel()); }
+
 	public int getDictionaryImportProgressUpdateInterval() { return 250; /* ms */ }
 	public int getDictionaryImportWordChunkSize() { return 1000; /* words */ }
 
diff --git a/src/io/github/sspanak/tt9/preferences/screens/DebugScreen.java b/src/io/github/sspanak/tt9/preferences/screens/DebugScreen.java
index ff79b220..ed3025f4 100644
--- a/src/io/github/sspanak/tt9/preferences/screens/DebugScreen.java
+++ b/src/io/github/sspanak/tt9/preferences/screens/DebugScreen.java
@@ -41,11 +41,7 @@ public class DebugScreen extends BaseScreenFragment {
 
 		msgSwitch.setChecked(Logger.isDebugLevel());
 		msgSwitch.setOnPreferenceChangeListener((Preference p, Object newValue) -> {
-			if ((boolean) newValue) {
-				Logger.setDebugLevel();
-			} else {
-				Logger.setDefaultLevel();
-			}
+			Logger.enableDebugLevel((boolean) newValue);
 			return true;
 		});
 	}