diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index bc68f8c76..ec56b8e8e 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -838,7 +838,7 @@ class Search(views.APIView):
             if "in tsquery:" in str(e):
                 return Response(
                     {"detail": "Invalid query"}, status=400
-                )  # TODO This might be better a 500?
+                )
             else:
                 raise
 
diff --git a/api/tests/music/test_views.py b/api/tests/music/test_views.py
index 4c4d407a2..3a069cb16 100644
--- a/api/tests/music/test_views.py
+++ b/api/tests/music/test_views.py
@@ -1346,12 +1346,14 @@ def test_search_get(logged_in_api_client, factories):
     factories["tags.Tag"]()
 
     url = reverse("api:v1:search")
-    expected = {
-        "artists": [serializers.ArtistWithAlbumsSerializer(artist).data],
-        "albums": [serializers.AlbumSerializer(album).data],
-        "tracks": [serializers.TrackSerializer(track).data],
-        "tags": [views.TagSerializer(tag).data],
-    }
+    expected = serializers.SearchResultSerializer(
+        {
+            "artists": [artist],
+            "albums": [album],
+            "tracks": [track],
+            "tags": [tag],
+        }
+    ).data
 
     response = logged_in_api_client.get(url, {"q": "foo"})