diff --git a/src/libtomahawk/Album.cpp b/src/libtomahawk/Album.cpp
index a639042c7..b3f760076 100644
--- a/src/libtomahawk/Album.cpp
+++ b/src/libtomahawk/Album.cpp
@@ -176,6 +176,8 @@ Album::infoSystemInfo( const Tomahawk::InfoSystem::InfoRequestData& requestData,
 
     if ( !output.isNull() && output.isValid() )
     {
+        m_coverLoaded = true;
+
         QVariantMap returnedData = output.value< QVariantMap >();
         const QByteArray ba = returnedData["imgbytes"].toByteArray();
         if ( ba.length() )
@@ -183,8 +185,6 @@ Album::infoSystemInfo( const Tomahawk::InfoSystem::InfoRequestData& requestData,
             m_coverBuffer = ba;
             emit coverChanged();
         }
-
-        m_coverLoaded = true;
     }
 }
 
@@ -237,6 +237,6 @@ Album::infoid() const
 {
     if ( m_uuid.isEmpty() )
         m_uuid = uuid();
-    
+
     return m_uuid;
 }
\ No newline at end of file
diff --git a/src/libtomahawk/Artist.cpp b/src/libtomahawk/Artist.cpp
index fbd30f477..b18a03215 100644
--- a/src/libtomahawk/Artist.cpp
+++ b/src/libtomahawk/Artist.cpp
@@ -317,14 +317,14 @@ Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVari
         {
             if ( !output.isNull() && output.isValid() )
             {
+                m_coverLoaded = true;
+
                 const QByteArray ba = returnedData["imgbytes"].toByteArray();
                 if ( ba.length() )
                 {
                     m_coverBuffer = ba;
                     emit coverChanged();
                 }
-
-                m_coverLoaded = true;
             }
 
             break;
@@ -353,7 +353,7 @@ Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVari
                 if ( source == "last.fm" )
                     m_biography = bmap[ source ].toHash()[ "text" ].toString();
             }
-            
+
             m_biographyLoaded = true;
             emit biographyLoaded();
 
@@ -459,7 +459,7 @@ Artist::playlistInterface( ModelMode mode, const Tomahawk::collection_ptr& colle
         pli = Tomahawk::playlistinterface_ptr( new Tomahawk::ArtistPlaylistInterface( this, mode, collection ) );
         connect( pli.data(), SIGNAL( tracksLoaded( Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
                                SLOT( onTracksLoaded( Tomahawk::ModelMode, Tomahawk::collection_ptr ) ) );
-        
+
         m_playlistInterface[ mode ][ collection ] = pli;
     }
 
@@ -479,6 +479,6 @@ Artist::infoid() const
 {
     if ( m_uuid.isEmpty() )
         m_uuid = uuid();
-    
+
     return m_uuid;
 }