diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsManager.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsManager.java
index 299f3c899..0d51a6a99 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsManager.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsManager.java
@@ -153,10 +153,10 @@ public class AnalyticsManager implements OnSharedPreferenceChangeListener {
     }
 
     public synchronized void refreshSettings(Context context) {
-        boolean analyticsHasConsent = Preferences.getPreferences(context).isAnalyticsHasConsent();
+        boolean shouldEnableAnalytics = shouldEnableAnalytics(context);
         boolean analyticsEnabled = piwikTracker != null;
-        if (analyticsHasConsent != analyticsEnabled) {
-            if (analyticsHasConsent) {
+        if (shouldEnableAnalytics != analyticsEnabled) {
+            if (shouldEnableAnalytics) {
                 TrackerConfig trackerConfig;
                 if (Constants.DEBUG) {
                     trackerConfig = new TrackerConfig("https://piwik.openkeychain.org/", 3, "OpenKeychainDebug");
@@ -172,4 +172,9 @@ public class AnalyticsManager implements OnSharedPreferenceChangeListener {
             }
         }
     }
+
+    private boolean shouldEnableAnalytics(Context context) {
+        Preferences preferences = Preferences.getPreferences(context);
+        return preferences.isAnalyticsHasConsent() && !preferences.getUseTorProxy();
+    }
 }