diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 6ff419080..579868c2e 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -84,3 +84,5 @@
 
 # Keep generated protobuf classes
 -keep class nodomain.freeyourgadget.gadgetbridge.proto.** { *; }
+# https://github.com/protocolbuffers/protobuf/blob/main/java/lite.md#r8-rule-to-make-production-app-builds-work
+-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
diff --git a/gradle.properties b/gradle.properties
index 9622d572d..872fcadff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,3 @@ org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 # org.gradle.parallel=true
 android.useAndroidX=true
 android.enableJetifier=true
-
-# FIXME: This optimizes away some classes it should not - see #3853
-android.enableR8.fullMode=false