diff --git a/libraries/pushproviders/firebase/build.gradle.kts b/libraries/pushproviders/firebase/build.gradle.kts
index 33e88dd94c..cfe5dd01fb 100644
--- a/libraries/pushproviders/firebase/build.gradle.kts
+++ b/libraries/pushproviders/firebase/build.gradle.kts
@@ -26,10 +26,10 @@ android {
 
     buildTypes {
         getByName("release") {
-            consumerProguardFiles("consumer-proguard-rules.pro")
+            consumerProguardFiles("consumer-rules.keep")
         }
         register("nightly") {
-            consumerProguardFiles("consumer-proguard-rules.pro")
+            consumerProguardFiles("consumer-rules.keep")
             matchingFallbacks += listOf("release")
         }
     }
diff --git a/libraries/pushproviders/firebase/consumer-proguard-rules.pro b/libraries/pushproviders/firebase/consumer-proguard-rules.pro
deleted file mode 100644
index 0bc7b604bf..0000000000
--- a/libraries/pushproviders/firebase/consumer-proguard-rules.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-# Fix this error:
-# ERROR: Missing classes detected while running R8. Please add the missing classes or apply additional keep rules that are generated in /Users/bmarty/workspaces/element-x-android/app/build/outputs/mapping/nightly/missing_rules.txt.
-# ERROR: R8: Missing class com.google.firebase.analytics.connector.AnalyticsConnector (referenced from: void com.google.firebase.messaging.MessagingAnalytics.logToScion(java.lang.String, android.os.Bundle) and 1 other context)
--dontwarn com.google.firebase.analytics.connector.AnalyticsConnector
diff --git a/libraries/pushproviders/firebase/consumer-rules.keep b/libraries/pushproviders/firebase/consumer-rules.keep
new file mode 100644
index 0000000000..401c769d27
--- /dev/null
+++ b/libraries/pushproviders/firebase/consumer-rules.keep
@@ -0,0 +1,4 @@
+# firebase-messaging references AnalyticsConnector, but we exclude firebase-analytics and
+# firebase-measurement-connector from its dependencies (see build.gradle.kts), so R8 reports it as a
+# missing class.
+-dontwarn com.google.firebase.analytics.connector.AnalyticsConnector