diff --git a/rbac/management/querysets.py b/rbac/management/querysets.py
index ddc119faf..5ad6bb85e 100644
--- a/rbac/management/querysets.py
+++ b/rbac/management/querysets.py
@@ -155,9 +155,9 @@ def get_role_queryset(request) -> QuerySet:
     """Obtain the queryset for roles."""
     scope = validate_and_get_key(request.query_params, SCOPE_KEY, VALID_SCOPES, ORG_ID_SCOPE)
     public_tenant = Tenant.objects.get(tenant_name="public")
-    base_query = annotate_roles_with_counts(Role.objects.prefetch_related("access")).filter(
-        tenant__in=[request.tenant, public_tenant]
-    )
+    base_query = annotate_roles_with_counts(
+        Role.objects.prefetch_related("access", "ext_relation", "access__permission")
+    ).filter(tenant__in=[request.tenant, public_tenant])
 
     if scope == PRINCIPAL_SCOPE:
         queryset = get_object_principal_queryset(
diff --git a/rbac/rbac/settings.py b/rbac/rbac/settings.py
index 6e832678b..d59c0c45f 100644
--- a/rbac/rbac/settings.py
+++ b/rbac/rbac/settings.py
@@ -84,7 +84,6 @@
 
 ALLOWED_HOSTS = ["*"]
 
-
 # Application definition
 
 INSTALLED_APPS = [
diff --git a/tests/internal/integration/test_integration_views.py b/tests/internal/integration/test_integration_views.py
index 506f6e20d..a7959ee1e 100644
--- a/tests/internal/integration/test_integration_views.py
+++ b/tests/internal/integration/test_integration_views.py
@@ -442,6 +442,7 @@ def test_roles_for_org(self, mock_request):
             **self.request.META,
             follow=True,
         )
+
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data.get("meta").get("count"), 1)