diff --git a/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp b/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp
index dc7ffc9ab..ac35f6269 100644
--- a/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp
@@ -134,7 +134,8 @@ DatabaseCommand_AddFiles::exec( DatabaseImpl* dbi )
         // add the album artist to the artist database
         albumartistid = dbi->artistId( albumartist, true );
         
-        artistid = dbi->artistId( artist, true );
+	if( !artist.trimmed().isEmpty() )
+        	artistid = dbi->artistId( artist, true );
         if ( artistid < 1 )
             continue;
         trackid = dbi->trackId( artistid, track, true );