diff --git a/plug-ins/metadata/metadata-editor.c b/plug-ins/metadata/metadata-editor.c
index e4f241ae5d..bc786ae9a6 100644
--- a/plug-ins/metadata/metadata-editor.c
+++ b/plug-ins/metadata/metadata-editor.c
@@ -4173,7 +4173,8 @@ metadata_editor_write_callback (GtkWidget  *dialog,
                 {
                   gexiv2_metadata_clear_tag (GEXIV2_METADATA (g_metadata),
                                              equivalent_metadata_tags[index].tag);
-                  if (! gexiv2_metadata_set_tag_string (GEXIV2_METADATA (g_metadata),
+                  if (*text_value &&
+                      ! gexiv2_metadata_set_tag_string (GEXIV2_METADATA (g_metadata),
                                                         equivalent_metadata_tags[index].tag,
                                                         text_value))
                     {