diff --git a/netbox/netbox/graphql/fields.py b/netbox/netbox/graphql/fields.py index 57685389e..1f53792a3 100644 --- a/netbox/netbox/graphql/fields.py +++ b/netbox/netbox/graphql/fields.py @@ -57,8 +57,10 @@ class ObjectListField(DjangoListField): # Get the QuerySet from the object type queryset = django_object_type.get_queryset(default_manager, info) - # Instantiate and apply the FilterSet + # Instantiate and apply the FilterSet, if defined filterset_class = django_object_type._meta.filterset_class - filterset = filterset_class(data=args, queryset=queryset, request=info.context) + if filterset_class: + filterset = filterset_class(data=args, queryset=queryset, request=info.context) + return filterset.qs - return filterset.qs + return queryset