diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp
index b31cc65e..dba54d58 100644
--- a/taglib/flac/flacfile.cpp
+++ b/taglib/flac/flacfile.cpp
@@ -168,8 +168,9 @@ bool FLAC::File::save()
   }
 
   // Create new vorbis comments
-
-  Tag::duplicate(&d->tag, xiphComment(true), false);
+  if (!hasXiphComment())
+    Tag::duplicate(&d->tag, xiphComment(true), false);
+  
 
   d->xiphCommentData = xiphComment()->render(false);