diff --git a/app/src/debug/java/org/mozilla/fenix/DebugFenixApplication.kt b/app/src/debug/java/org/mozilla/fenix/DebugFenixApplication.kt
index 9120a1420..d9e98ce17 100644
--- a/app/src/debug/java/org/mozilla/fenix/DebugFenixApplication.kt
+++ b/app/src/debug/java/org/mozilla/fenix/DebugFenixApplication.kt
@@ -36,8 +36,8 @@ class DebugFenixApplication : FenixApplication() {
context: Context,
private val defaultDumper: HeapDumper
) : HeapDumper {
- var prefs: SharedPreferences? = PreferenceManager.getDefaultSharedPreferences(context)
- var enabled = prefs?.getBoolean(context.getPreferenceKey(pref_key_leakcanary), true) ?: true
+ var prefs: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+ var enabled = prefs.getBoolean(context.getPreferenceKey(pref_key_leakcanary), false)
override fun dumpHeap(): File? = if (enabled) defaultDumper.dumpHeap() else HeapDumper.RETRY_LATER
}
}
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 90f96bb70..5331e9bf9 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -67,7 +67,8 @@
+ android:title="@string/preference_leakcanary"
+ android:defaultValue="false" />