diff --git a/src/plugin_xmms/wrap_id3.c b/src/plugin_xmms/wrap_id3.c
index e6bc12ea..aeeafa04 100644
--- a/src/plugin_xmms/wrap_id3.c
+++ b/src/plugin_xmms/wrap_id3.c
@@ -98,6 +98,8 @@ char *flac_format_song_title(char *filename)
 	XMMS_NEW_TITLEINPUT(input);
 
 	input->performer = local__getstr(tag.performer);
+	if(!input->performer)
+		input->performer = local__getstr(tag.composer);
 	input->album_name = local__getstr(tag.album);
 	input->track_name = local__getstr(tag.title);
 	input->track_number = local__getnum(tag.track_number);