diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 93dcb7b1ed..20edba59a9 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,5 +1,4 @@
 -dontobfuscate
--dontoptimize
 
 -keep,allowoptimization class eu.kanade.**
 -keep,allowoptimization class tachiyomi.**
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e47d864644..83d7b1191d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,6 +13,16 @@ pluginManagement {
         mavenCentral()
         maven(url = "https://www.jitpack.io")
     }
+    // https://issuetracker.google.com/344363457
+    // TODO: Remove when AGP's bundled R8 is updated
+    buildscript {
+        repositories {
+            maven("https://storage.googleapis.com/r8-releases/raw")
+        }
+        dependencies {
+            classpath("com.android.tools:r8:8.5.31")
+        }
+    }
 }
 
 dependencyResolutionManagement {