diff --git a/app/build.gradle b/app/build.gradle
index a260f405..31d40322 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,13 +22,11 @@ android {
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
-            buildConfigField "boolean", "USE_LEAK_CANARY", "true"
         }
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
-            buildConfigField "boolean", "USE_LEAK_CANARY", "false"
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/App.kt b/app/src/main/kotlin/com/simplemobiletools/notes/App.kt
index bf2e6e35..ffc697e8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/App.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/App.kt
@@ -3,20 +3,19 @@ package com.simplemobiletools.notes
 import android.app.Application
 import com.facebook.stetho.Stetho
 import com.simplemobiletools.commons.extensions.checkUseEnglish
-import com.simplemobiletools.notes.BuildConfig.USE_LEAK_CANARY
 import com.squareup.leakcanary.LeakCanary
 
 class App : Application() {
     override fun onCreate() {
         super.onCreate()
-        if (USE_LEAK_CANARY) {
+        if (BuildConfig.DEBUG) {
             if (LeakCanary.isInAnalyzerProcess(this)) {
                 return
             }
             LeakCanary.install(this)
+            Stetho.initializeWithDefaults(this)
         }
 
         checkUseEnglish()
-        Stetho.initializeWithDefaults(this)
     }
 }