Index: apps/tagcache.c
===================================================================
--- apps/tagcache.c	(revision 13691)
+++ apps/tagcache.c	(working copy)
@@ -1692,7 +1692,11 @@
     ADD_TAG(entry, tag_genre, &track.id3.genre_string);
     ADD_TAG(entry, tag_composer, &track.id3.composer);
     ADD_TAG(entry, tag_comment, &track.id3.comment);
-    ADD_TAG(entry, tag_albumartist, &track.id3.albumartist);
+    if (track.id3.albumartist != NULL && strlen(track.id3.albumartist) > 0) {
+        ADD_TAG(entry, tag_albumartist, &track.id3.albumartist);
+    } else {
+        ADD_TAG(entry, tag_albumartist, &track.id3.artist);
+    }
     entry.data_length = offset;
     
     /* Write the header */
@@ -1706,7 +1710,11 @@
     write_item(track.id3.genre_string);
     write_item(track.id3.composer);
     write_item(track.id3.comment);
-    write_item(track.id3.albumartist);
+    if (track.id3.albumartist != NULL && strlen(track.id3.albumartist) > 0) {
+        write_item(track.id3.albumartist);
+    } else {
+        write_item(track.id3.artist);
+    }
     total_entry_count++;    
 }