diff --git a/pages/addtags/mzta-add-tags.js b/pages/addtags/mzta-add-tags.js
index 2944f775..e1782f2a 100644
--- a/pages/addtags/mzta-add-tags.js
+++ b/pages/addtags/mzta-add-tags.js
@@ -145,8 +145,12 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     document.querySelectorAll('.accountCheckbox').forEach(checkbox => {
       checkbox.addEventListener('change', () => {
-        let selectedAccounts = Array.from(document.querySelectorAll('.accountCheckbox:checked')).map(checkbox => checkbox.value);
+      let selectedAccounts = Array.from(document.querySelectorAll('.accountCheckbox:checked')).map(checkbox => checkbox.value);
+      if (selectedAccounts.length === document.querySelectorAll('.accountCheckbox').length) {
+        browser.storage.sync.set({ add_tags_enabled_accounts: [] });
+      } else {
         browser.storage.sync.set({ add_tags_enabled_accounts: selectedAccounts });
+      }
       });
     });