diff --git a/app/src/googleplay/AndroidManifest.xml b/app/src/googleplay/AndroidManifest.xml
index 734bc9792..55a98dbfa 100644
--- a/app/src/googleplay/AndroidManifest.xml
+++ b/app/src/googleplay/AndroidManifest.xml
@@ -17,10 +17,6 @@
       android:name="com.google.android.geo.API_KEY"
       android:value="@string/google_key"/>
 
-    <meta-data
-      android:name="firebase_crashlytics_collection_enabled"
-      android:value="false"/>
-
     <meta-data
       android:name="com.google.android.backup.api_key"
       android:value="AEdPqrEAAAAI49v5bBusi_bq1bgLBB1LIsepNV0eBrFkQrBZkw"/>
diff --git a/app/src/googleplay/java/org/tasks/analytics/Tracker.java b/app/src/googleplay/java/org/tasks/analytics/Tracker.java
index 288095ad6..9880fc238 100644
--- a/app/src/googleplay/java/org/tasks/analytics/Tracker.java
+++ b/app/src/googleplay/java/org/tasks/analytics/Tracker.java
@@ -30,6 +30,7 @@ public class Tracker {
     enabled = preferences.isTrackingEnabled();
     if (enabled) {
       analytics = FirebaseAnalytics.getInstance(context);
+      analytics.setAnalyticsCollectionEnabled(true);
       Fabric.with(context, new Crashlytics());
     } else {
       analytics = null;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9867444f6..cbd4c5bb4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -102,6 +102,14 @@
     android:theme="@style/Tasks"
     tools:ignore="GoogleAppIndexingWarning">
 
+    <meta-data
+      android:name="firebase_crashlytics_collection_enabled"
+      android:value="false"/>
+
+    <meta-data
+      android:name="firebase_analytics_collection_enabled"
+      android:value="false"/>
+
     <!-- ====================================================== Activities = -->
 
     <activity
diff --git a/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java b/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
index f7a3ede74..69bf082fb 100644
--- a/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
+++ b/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
@@ -11,7 +11,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.tasks.analytics.Tracker;
-import timber.log.Timber;
 
 public class LimitOffsetDataSource extends PositionalDataSource<Task> {
 
@@ -31,7 +30,6 @@ public class LimitOffsetDataSource extends PositionalDataSource<Task> {
     try {
       cursor = mDb.query(mCountQuery, null);
     } catch (Exception e) {
-      Timber.e(e);
       Tracker.report(e);
       return 0;
     }
diff --git a/app/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java
index ea65666d6..a02b4b28b 100644
--- a/app/src/main/java/org/tasks/preferences/Preferences.java
+++ b/app/src/main/java/org/tasks/preferences/Preferences.java
@@ -172,7 +172,7 @@ public class Preferences {
   }
 
   public boolean isTrackingEnabled() {
-    return !BuildConfig.DEBUG && getBoolean(R.string.p_collect_statistics, true);
+    return getBoolean(R.string.p_collect_statistics, true);
   }
 
   public String getDefaultCalendar() {