diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 27168bf9b..41bef2786 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -27,6 +27,8 @@
             android:name="firebase_performance_logcat_enabled"
             android:value="true" />
         <meta-data android:name="firebase_analytics_collection_enabled" android:value="false" />
+        <meta-data android:name="firebase_performance_collection_enabled" android:value="false" />
+
         <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
             android:value="@string/application_ad_id"/>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Analytics.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Analytics.kt
index 44a79a9b9..f992a2a30 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Analytics.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Analytics.kt
@@ -8,6 +8,7 @@ import com.amplitude.android.Configuration
 import com.amplitude.android.events.Identify
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.perf.FirebasePerformance
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.R
 
@@ -129,12 +130,9 @@ object Analytics {
     }
 
     fun setAnalyticsConsent(consents: Boolean?) {
-        if (consents == true) {
-            firebase.setAnalyticsCollectionEnabled(true)
-            amplitude.configuration.optOut = false
-        } else {
-            firebase.setAnalyticsCollectionEnabled(false)
-            amplitude.configuration.optOut = true
-        }
+        val isEnabled = consents == true
+        firebase.setAnalyticsCollectionEnabled(isEnabled)
+        FirebasePerformance.getInstance().isPerformanceCollectionEnabled = isEnabled
+        amplitude.configuration.optOut = !isEnabled
     }
 }