diff --git a/wau/addons.py b/wau/addons.py
index 4aef516..46947da 100644
--- a/wau/addons.py
+++ b/wau/addons.py
@@ -86,7 +86,6 @@ class Addon:
 
     def uninstall(self) -> None:
         logger.info("Uninstalling %s", self)
-        shutil.rmtree(self.download_dir, ignore_errors=True)
         for dir in self.dirs:
             shutil.rmtree(config.ADDONS_DIR.joinpath(dir.name), ignore_errors=True)
 
diff --git a/wau/cli.py b/wau/cli.py
index d5302f3..c5846d5 100644
--- a/wau/cli.py
+++ b/wau/cli.py
@@ -120,6 +120,7 @@ class CLI:
         for addon in remove:
             print(f"Removing {addon.name}")
             addon.uninstall()
+            shutil.rmtree(addon.download_dir, ignore_errors=True)
             self.installed_addons.remove(addon)
         addons.save_installed_addons(self.installed_addons)