diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index d0cd57a42..c0de9a98b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -70,9 +70,10 @@
 # Keep extension's common dependencies
 -keep class eu.kanade.tachiyomi.source.** { public protected *; } # Avoid access modification
 -keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; }
--keep,allowoptimization class androidx.preference.** { *; }
+-keep,allowoptimization class androidx.preference.** { public protected *; }
 -keep,allowoptimization class kotlin.** { public protected *; }
 -keep,allowoptimization class kotlinx.coroutines.** { public protected *; }
+-keep,allowoptimization class kotlinx.serialization.** { public protected *; }
 -keep,allowoptimization class okhttp3.** { public protected *; }
 -keep,allowoptimization class okio.** { public protected *; }
 -keep,allowoptimization class rx.** { public protected *; }
@@ -80,7 +81,6 @@
 -keep,allowoptimization class com.squareup.duktape.** { public protected *; }
 -keep,allowoptimization class app.cash.quickjs.** { public protected *; }
 -keep,allowoptimization class uy.kohesive.injekt.** { public protected *; }
--keep,allowoptimization class kotlinx.serialization.** { public protected *; }
 
 # RxJava 1.1.0
 -dontwarn sun.misc.**
diff --git a/build.gradle.kts b/build.gradle.kts
index e255b2f41..bfe18efe1 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)