diff --git a/trustgraph-base/trustgraph/base/agent_service.py b/trustgraph-base/trustgraph/base/agent_service.py
index 0d38114b..d675983a 100644
--- a/trustgraph-base/trustgraph/base/agent_service.py
+++ b/trustgraph-base/trustgraph/base/agent_service.py
@@ -93,6 +93,8 @@ class AgentService(FlowProcessor):
                     thought = None,
                     observation = None,
                     answer = None,
+                    end_of_message = True,
+                    end_of_dialog = True,
                 ),
                 properties={"id": id}
             )
diff --git a/trustgraph-flow/trustgraph/agent/react/service.py b/trustgraph-flow/trustgraph/agent/react/service.py
index d4a4d72f..5d19df71 100755
--- a/trustgraph-flow/trustgraph/agent/react/service.py
+++ b/trustgraph-flow/trustgraph/agent/react/service.py
@@ -232,12 +232,14 @@ class Processor(AgentService):
                         observation=None,
                     )
                 else:
-                    # Legacy format
+                    # Non-streaming format
                     r = AgentResponse(
                         answer=None,
                         error=None,
                         thought=x,
                         observation=None,
+                        end_of_message=True,
+                        end_of_dialog=False,
                     )
 
                 await respond(r)
@@ -260,12 +262,14 @@ class Processor(AgentService):
                         observation=x,
                     )
                 else:
-                    # Legacy format
+                    # Non-streaming format
                     r = AgentResponse(
                         answer=None,
                         error=None,
                         thought=None,
                         observation=x,
+                        end_of_message=True,
+                        end_of_dialog=False,
                     )
 
                 await respond(r)
@@ -288,12 +292,14 @@ class Processor(AgentService):
                         observation=None,
                     )
                 else:
-                    # Legacy format - shouldn't be called in non-streaming mode
+                    # Non-streaming format - shouldn't normally be called
                     r = AgentResponse(
                         answer=x,
                         error=None,
                         thought=None,
                         observation=None,
+                        end_of_message=True,
+                        end_of_dialog=False,
                     )
 
                 await respond(r)
@@ -364,11 +370,13 @@ class Processor(AgentService):
                         thought=None,
                     )
                 else:
-                    # Legacy format - send complete answer
+                    # Non-streaming format - send complete answer
                     r = AgentResponse(
                         answer=act.final,
                         error=None,
                         thought=None,
+                        end_of_message=True,
+                        end_of_dialog=True,
                     )
 
                 await respond(r)