diff --git a/app/src/generic/java/org/tasks/analytics/Tracker.java b/app/src/generic/java/org/tasks/analytics/Tracker.java
index 0b31bdc00..e7921d287 100644
--- a/app/src/generic/java/org/tasks/analytics/Tracker.java
+++ b/app/src/generic/java/org/tasks/analytics/Tracker.java
@@ -8,14 +8,8 @@ public class Tracker {
   @Inject
   public Tracker() {}
 
-  public void setTrackingEnabled(boolean enabled) {}
-
   public void reportException(Throwable t) {
-    Timber.e(t, t.getMessage());
-  }
-
-  public void reportException(Thread thread, Throwable t) {
-    Timber.e(t, t.getMessage());
+    Timber.e(t);
   }
 
   public void reportEvent(Tracking.Events event) {}
@@ -27,4 +21,8 @@ public class Tracker {
   public void reportEvent(Tracking.Events category, String action, String label) {}
 
   public void reportIabResult(int resultCode, String skus) {}
+
+  public static void report(Exception e) {
+    Timber.e(e);
+  }
 }
diff --git a/app/src/googleplay/java/org/tasks/analytics/Tracker.java b/app/src/googleplay/java/org/tasks/analytics/Tracker.java
index 3b80077b0..f291948d8 100644
--- a/app/src/googleplay/java/org/tasks/analytics/Tracker.java
+++ b/app/src/googleplay/java/org/tasks/analytics/Tracker.java
@@ -19,9 +19,10 @@ import timber.log.Timber;
 @ApplicationScope
 public class Tracker {
 
+  private static boolean enabled;
+
   private final FirebaseAnalytics analytics;
   private final Context context;
-  private final boolean enabled;
 
   @Inject
   public Tracker(@ForApplication Context context, Preferences preferences) {
@@ -35,13 +36,17 @@ public class Tracker {
     }
   }
 
-  public void reportException(Throwable t) {
+  public static void report(Throwable t) {
     Timber.e(t);
     if (enabled) {
       Crashlytics.logException(t);
     }
   }
 
+  public void reportException(Throwable t) {
+    report(t);
+  }
+
   public void reportEvent(Tracking.Events event) {
     reportEvent(event, null);
   }
diff --git a/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java b/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
index 25cc3b67f..87d3839e7 100644
--- a/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
+++ b/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
@@ -6,11 +6,11 @@ import android.database.Cursor;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
-import com.crashlytics.android.Crashlytics;
 import com.todoroo.astrid.data.Task;
 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> {
@@ -32,7 +32,7 @@ public class LimitOffsetDataSource extends PositionalDataSource<Task> {
     cursor = mDb.query(mCountQuery, null);
     } catch (Exception e) {
       Timber.e(e);
-      Crashlytics.logException(e);
+      Tracker.report(e);
       return 0;
     }
     try {