--- a/toolkit/components/url-classifier/SafeBrowsing.jsm
+++ b/toolkit/components/url-classifier/SafeBrowsing.jsm
@@ -280,19 +280,24 @@ this.SafeBrowsing = {
         listManager.enableUpdate(downloadAllowLists[i]);
       } else {
         listManager.disableUpdate(downloadAllowLists[i]);
       }
     }
     for (let i = 0; i < trackingProtectionLists.length; ++i) {
       if (this.trackingEnabled) {
         listManager.enableUpdate(trackingProtectionLists[i]);
+      } else {
+        listManager.disableUpdate(trackingProtectionLists[i]);
+      }
+    }
+    for (let i = 0; i < trackingProtectionWhitelists.length; ++i) {
+      if (this.trackingEnabled) {
         listManager.enableUpdate(trackingProtectionWhitelists[i]);
       } else {
-        listManager.disableUpdate(trackingProtectionLists[i]);
         listManager.disableUpdate(trackingProtectionWhitelists[i]);
       }
     }
     for (let i = 0; i < forbiddenLists.length; ++i) {
       if (this.forbiddenEnabled) {
         listManager.enableUpdate(forbiddenLists[i]);
       } else {
         listManager.disableUpdate(forbiddenLists[i]);