diff --git a/src/libtomahawk/playlist/customplaylistview.cpp b/src/libtomahawk/playlist/customplaylistview.cpp
index e12e34e6e..a0ced38a1 100644
--- a/src/libtomahawk/playlist/customplaylistview.cpp
+++ b/src/libtomahawk/playlist/customplaylistview.cpp
@@ -50,16 +50,16 @@ CustomPlaylistView::generateTracks()
         case SourceLovedTracks:
             sql = QString( "SELECT track.name, artist.name, COUNT(*) as counter "
                            "FROM social_attributes, track, artist "
-                           "WHERE social_attributes.id = track.id AND artist.id = track.artist AND social_attributes.k = 'Love' AND source IS NULL "
+                           "WHERE social_attributes.id = track.id AND artist.id = track.artist AND social_attributes.k = 'Love' AND social_attributes.source %1 "
                            "GROUP BY track.id "
-                           "ORDER BY counter DESC " );
+                           "ORDER BY counter DESC, social_attributes.timestamp DESC " ).arg( m_source->isLocal() ? "IS NULL" : QString( "=%1" ).arg( m_source->id() ) );
             break;
         case AllLovedTracks:
             sql = QString( "SELECT track.name, artist.name, source, COUNT(*) as counter "
                            "FROM social_attributes, track, artist "
                            "WHERE social_attributes.id = track.id AND artist.id = track.artist AND social_attributes.k = 'Love' "
                            "GROUP BY track.id "
-                           "ORDER BY counter DESC " );
+                           "ORDER BY counter DESC, social_attributes.timestamp DESC " );
             break;
     }