diff --git a/picard/plugins/picardmutagen/apev2.py b/picard/plugins/picardmutagen/apev2.py
index aa91c5149..c2923e30c 100644
--- a/picard/plugins/picardmutagen/apev2.py
+++ b/picard/plugins/picardmutagen/apev2.py
@@ -60,13 +60,15 @@ class APEv2File(File):
             tags = mutagen.apev2.APEv2(encode_filename(self.filename))
         except mutagen.apev2.APENoHeaderError:
             tags = mutagen.apev2.APEv2()
+        if self.config.setting["clear_existing_tags"]:
+            tags.clear()
         for name, value in self.metadata.items():
             if name.startswith("~"):
                 continue
             if name == "date":
                 name = "Year"
             elif name == "totaltracks":
-                pass
+                continue
             elif name == "tracknumber":
                 name = "Track"
                 totaltracks = self.metadata["totaltracks"]
diff --git a/picard/plugins/picardmutagen/vorbis.py b/picard/plugins/picardmutagen/vorbis.py
index 9e5fe103a..ec27d5049 100644
--- a/picard/plugins/picardmutagen/vorbis.py
+++ b/picard/plugins/picardmutagen/vorbis.py
@@ -42,6 +42,8 @@ class VCommentFile(File):
     def save(self):
         """Save metadata to the file."""
         file = self._File(encode_filename(self.filename))
+        if self.config.setting["clear_existing_tags"]:
+            file.tags.clear()
         for name, value in self.metadata.items():
             if not name.startswith("~"):
                 file.tags[name] = value