diff --git a/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py b/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py
index 1e306e1a42b9..bb6e5d4930cd 100644
--- a/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py
+++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py
@@ -494,7 +494,7 @@ def test_list_taxonomy_query_count(self):
         url = TAXONOMY_ORG_LIST_URL + f'?org={self.orgA.short_name}&enabled=true'
 
         self.client.force_authenticate(user=self.staff)
-        with self.assertNumQueries(19):  # TODO Why so many queries?
+        with self.assertNumQueries(17):  # TODO Why so many queries?
             response = self.client.get(url)
 
         assert response.status_code == 200
diff --git a/openedx/core/djangoapps/content_tagging/rest_api/v1/views.py b/openedx/core/djangoapps/content_tagging/rest_api/v1/views.py
index 11bbea265184..a1a1a318014d 100644
--- a/openedx/core/djangoapps/content_tagging/rest_api/v1/views.py
+++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/views.py
@@ -67,7 +67,7 @@ def get_queryset(self):
             queryset = get_taxonomies(enabled)
 
         # Prefetch tag_set so we can serialize the tag counts
-        return queryset.prefetch_related("taxonomyorg_set", "tag_set")
+        return queryset.prefetch_related("taxonomyorg_set__org", "tag_set")
 
     def perform_create(self, serializer):
         """