diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index a3de543334..b59d7c2666 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -453,6 +453,12 @@ add_one_tag (const GstTagList * list, const gchar * tag, gpointer user_data)
   GList *it;
   GstFlacEnc *flacenc = GST_FLAC_ENC (user_data);
 
+  /* IMAGE and PREVIEW_IMAGE tags are already written
+   * differently, no need to store them inside the
+   * vorbiscomments too */
+  if (strcmp (tag, GST_TAG_IMAGE) == 0 || strcmp (tag, GST_TAG_PREVIEW_IMAGE))
+    return;
+
   comments = gst_tag_to_vorbis_comments (list, tag);
   for (it = comments; it != NULL; it = it->next) {
     FLAC__StreamMetadata_VorbisComment_Entry commment_entry;