diff --git a/src/libtomahawk/Album.cpp b/src/libtomahawk/Album.cpp
index 5806e3ffd..961131bb8 100644
--- a/src/libtomahawk/Album.cpp
+++ b/src/libtomahawk/Album.cpp
@@ -200,6 +200,12 @@ Album::id() const
 QPixmap
 Album::cover( const QSize& size, bool forceLoad ) const
 {
+    if ( name().isEmpty() )
+    {
+        m_coverLoaded = true;
+        return QPixmap();
+    }
+
     if ( !m_coverLoaded && !m_coverLoading )
     {
         if ( !forceLoad )
@@ -299,7 +305,6 @@ Album::infoSystemFinished( const QString& target )
                 this, SLOT( infoSystemFinished( QString ) ) );
 
     m_coverLoading = false;
-
     emit updated();
 }
 
diff --git a/src/libtomahawk/Album.h b/src/libtomahawk/Album.h
index 2eb2abb49..e8ff20cd3 100644
--- a/src/libtomahawk/Album.h
+++ b/src/libtomahawk/Album.h
@@ -94,7 +94,7 @@ private:
 
     artist_ptr m_artist;
 
-    bool m_coverLoaded;
+    mutable bool m_coverLoaded;
     mutable bool m_coverLoading;
     mutable QString m_uuid;