diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a169c5d033..6307f719d3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,8 +38,7 @@ play_barcode_version = "18.3.0"
 firebase_auth_version = "22.3.1"
 firebase_storage_version = "20.3.0"
 firebase_crashlytics_version = "18.6.4"
-# Update analytics with caution as it might cause `NoClassDefFoundError: Failed resolution of: ImmutableSet;`
-firebase_analytics_version = "21.4.0"
+firebase_analytics_version = "21.6.2"
 firebase_perf_version = "20.5.2"
 firebase_crashlyticsPlugin_version = "2.9.9"
 firebase_perfPlugin_version = "1.4.2"
diff --git a/infra/logging/build.gradle.kts b/infra/logging/build.gradle.kts
index fc00525922..0a3828fd66 100644
--- a/infra/logging/build.gradle.kts
+++ b/infra/logging/build.gradle.kts
@@ -36,9 +36,7 @@ android {
 
 dependencies {
     implementation(libs.firebase.crashlytics)
-    implementation(libs.firebase.analytics){
-        exclude("com.google.guava")
-    }
+    api(libs.firebase.analytics)
     implementation(libs.firebase.perf)
     implementation(libs.timber) {
         exclude("org.jetbrains", "annotations")