diff --git a/app/build.gradle b/app/build.gradle
index 3a1f862bd0..3f6bec872c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -107,10 +107,10 @@ android {
     }
 
     buildTypes {
+        // https://developer.android.com/studio/build/shrink-code
         release {
             debuggable = false
             minifyEnabled = true
-            useProguard = true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
@@ -118,7 +118,6 @@ android {
             applicationIdSuffix '.debug'
             debuggable = true
             minifyEnabled = false
-            useProguard = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/gradle.properties b/gradle.properties
index 43899fd297..897336fe38 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,5 +17,5 @@ org.gradle.warning.mode=all
 android.useAndroidX=true
 android.enableJetifier=true
 
-# Temporarily disable to disable LNO
-android.enableR8=false
+# Enables LNO :-(
+android.enableR8=true