diff --git a/api/tacticalrmm/agents/serializers.py b/api/tacticalrmm/agents/serializers.py
index bcc6e9ae..bc0b0b28 100644
--- a/api/tacticalrmm/agents/serializers.py
+++ b/api/tacticalrmm/agents/serializers.py
@@ -95,6 +95,7 @@ class AgentTableSerializer(serializers.ModelSerializer):
     local_ips = serializers.ReadOnlyField()
     make_model = serializers.ReadOnlyField()
     physical_disks = serializers.ReadOnlyField()
+    custom_fields = AgentCustomFieldSerializer(many=True, read_only=True)
 
     def get_alert_template(self, obj):
         if not obj.alert_template:
@@ -153,6 +154,7 @@ class AgentTableSerializer(serializers.ModelSerializer):
             "local_ips",
             "make_model",
             "physical_disks",
+            "custom_fields",
         ]
         depth = 2
 
diff --git a/api/tacticalrmm/agents/views.py b/api/tacticalrmm/agents/views.py
index 865c095b..5ecbf055 100644
--- a/api/tacticalrmm/agents/views.py
+++ b/api/tacticalrmm/agents/views.py
@@ -134,6 +134,10 @@ class GetAgents(APIView):
                         "checkresults",
                         queryset=CheckResult.objects.select_related("assigned_check"),
                     ),
+                    Prefetch(
+                        "custom_fields",
+                        queryset=AgentCustomField.objects.select_related("field"),
+                    ),
                 )
                 .annotate(
                     has_patches_pending=Exists(