diff --git a/funkwhale_api/music/views.py b/funkwhale_api/music/views.py
index ff771dc38cf2e5d90de7541b3112cdd2cd6aac62..a2cceed0a3f6cf46741eabd6442dc4c8604084e6 100644
--- a/funkwhale_api/music/views.py
+++ b/funkwhale_api/music/views.py
@@ -41,7 +41,7 @@ class TagViewSetMixin(object):
 class ArtistViewSet(SearchMixin, viewsets.ReadOnlyModelViewSet):
     queryset = (
         models.Artist.objects.all()
-                             .order_by('-creation_date')
+                             .order_by('name')
                              .prefetch_related(
                                 'albums__tracks__files',
                                 'albums__tracks__tags'))
@@ -107,7 +107,7 @@ class TrackViewSet(TagViewSetMixin, SearchMixin, viewsets.ReadOnlyModelViewSet):
             work = track.get_work()
 
         if not work:
-            return Response({'error': 'unavailable work'}, status=404)
+            return Response({'error': 'unavailable work '}, status=404)
 
         lyrics = work.fetch_lyrics()
         try: