diff --git a/taglib/riff/aiff/aifffile.cpp b/taglib/riff/aiff/aifffile.cpp
index 57131d47..28f4b803 100644
--- a/taglib/riff/aiff/aifffile.cpp
+++ b/taglib/riff/aiff/aifffile.cpp
@@ -115,9 +115,11 @@ bool RIFF::AIFF::File::save()
     return false;
   }
 
-  removeChunk("ID3 ");
-  removeChunk("id3 ");
-  d->hasID3v2 = false;
+  if(d->hasID3v2) {
+    removeChunk("ID3 ");
+    removeChunk("id3 ");
+    d->hasID3v2 = false;
+  }
 
   if(tag() && !tag()->isEmpty()) {
     setChunkData("ID3 ", d->tag->render());