diff --git a/etc/thunderbird/pref/40_security-misc.js b/etc/thunderbird/pref/40_security-misc.js
index 931f9d2..9e2b122 100644
--- a/etc/thunderbird/pref/40_security-misc.js
+++ b/etc/thunderbird/pref/40_security-misc.js
@@ -10,6 +10,7 @@
 // https://forums.whonix.org/t/enable-network-idn-show-punycode-by-default-in-thunderbird-to-fix-url-not-showing-real-domain-name-homograph-attack-punycode/8415
 pref("network.IDN_show_punycode", true);
 
+//### Telemetry
 // Disable all and any kind of telemetry by default
 pref("toolkit.telemetry.enabled", false);
 pref("toolkit.telemetry.unified", false);
@@ -21,11 +22,20 @@ pref("toolkit.telemetry.firstShutdownPing.enabled", false);
 pref("toolkit.telemetry.newProfilePing.enabled", false);
 pref("toolkit.telemetry.server", ""); // Defense in depth
 pref("toolkit.telemetry.server_owner", ""); // Defense in depth
-pref("datareporting.healthreport.uploadEnabled", false);
-pref("datareporting.policy.dataSubmissionEnabled", false);
 pref("toolkit.telemetry.coverage.opt-out", true); // from Firefox
 pref("toolkit.coverage.opt-out", true); // from Firefox
 
+// Disable Thunderbird archiving telemetry data locally
+// Thunderbird saves data to ~/.thunderbird/profile.default/datareporting/ 
+pref("datareporting.healthreport.about.reportUrl", "data:text/plain,");
+pref("datareporting.policy.dataSubmissionEnabled", false);
+pref("datareporting.healthreport.uploadEnabled", false);
+pref("datareporting.healthreport.service.enabled", false);
+pref("datareporting.healthreport.service.firstRun", false);
+pref("datareporting.healthreport.service.lastDataSubmissionRequested", 0);
+pref("datareporting.healthreport.service.lastDataSubmissionSuccessful", 0);
+pref("datareporting.healthreport.service.submitEnabled", false);
+
 // Disable implicit outbound traffic
 pref("network.connectivity-service.enabled", false);
 pref("network.prefetch-next", false);