diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 62c68321a9..a709dc1e80 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -82,4 +82,4 @@
 -keepclassmembers class kotlinx.serialization.** {
     <methods>;
 }
-##---------------End: proguard configuration for kotlinx.serialization  ----------
+##---------------End: proguard configuration for kotlinx.serialization  ----------
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index f1a44de2b0..2527067403 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,9 @@
 buildscript {
     dependencies {
+        // Pinning to older version of R8 due to weird forced optimizations in newer versions in
+        // version bundled with AGP
+        // https://mvnrepository.com/artifact/com.android.tools/r8?repo=google
+        classpath("com.android.tools:r8:3.1.66")
         classpath(libs.android.shortcut.gradle)
         classpath(libs.google.services.gradle)
         classpath(libs.aboutlibraries.gradle)