diff --git a/tests/integration/test_agent_structured_query_integration.py b/tests/integration/test_agent_structured_query_integration.py
index 2d556f93..f4f59444 100644
--- a/tests/integration/test_agent_structured_query_integration.py
+++ b/tests/integration/test_agent_structured_query_integration.py
@@ -60,7 +60,7 @@ class TestAgentStructuredQueryIntegration:
         request = AgentRequest(
             question="I need to find all customers from New York. Use the structured query tool to get this information.",
             state="",
-            group=[],
+            group=None,
             history=[],
             user="test_user"
         )
@@ -144,7 +144,7 @@ Args: {
         request = AgentRequest(
             question="Find data from a table that doesn't exist using structured query.",
             state="",
-            group=[],
+            group=None,
             history=[],
             user="test_user"
         )
@@ -216,7 +216,7 @@ Args: {
         request = AgentRequest(
             question="First find all customers from California, then tell me how many orders they have made.",
             state="",
-            group=[],
+            group=None,
             history=[],
             user="test_user"
         )
@@ -305,7 +305,7 @@ Args: {
         request = AgentRequest(
             question="Query the sales data for recent transactions.",
             state="",
-            group=[],
+            group=None,
             history=[],
             user="test_user"
         )
@@ -403,7 +403,7 @@ Args: {
         request = AgentRequest(
             question="Get customer information and format it nicely.",
             state="",
-            group=[],
+            group=None,
             history=[],
             user="test_user"
         )
diff --git a/trustgraph-flow/trustgraph/agent/tool_filter.py b/trustgraph-flow/trustgraph/agent/tool_filter.py
index f27d947c..d1bac3e4 100644
--- a/trustgraph-flow/trustgraph/agent/tool_filter.py
+++ b/trustgraph-flow/trustgraph/agent/tool_filter.py
@@ -29,7 +29,7 @@ def filter_tools_by_group_and_state(
     """
     
     # Apply defaults as specified in tech spec
-    if requested_groups is None or requested_groups == []:
+    if requested_groups is None:
         requested_groups = ["default"]
     if current_state is None or current_state == "":
         current_state = "undefined"