diff --git a/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp b/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp
index 6862dd3d6..ab0ef436d 100644
--- a/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp
@@ -131,8 +131,9 @@ DatabaseCommand_AddFiles::exec( DatabaseImpl* dbi )
         v = m;
 
         artistid = dbi->artistId( artist, true );
-        // add the album artist to the artist database
-        albumartistid = dbi->artistId( albumartist, true );
+        // add the album artist to the artist database.
+	if ( !albumartist.trimmed().isEmpty() )
+	  albumartistid = dbi->artistId( albumartist, true );
         
 	if ( !artist.trimmed().isEmpty() )
             artistid = dbi->artistId( artist, true );