diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
index 86561366..bda4d661 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
@@ -97,6 +97,7 @@ public class ConversationController : ControllerBase
                     MessageId = message.MessageId,
                     CreatedAt = message.CreatedAt,
                     Text = message.Content,
+                    Function = message.FunctionName,
                     Data = message.Data,
                     Sender = new UserViewModel
                     {
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs
index df0b0bde..23c48ee3 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs
@@ -113,6 +113,7 @@ public class ChatHubConversationHook : ConversationHookBase
             ConversationId = conv.ConversationId,
             MessageId = message.MessageId,
             Text = message.Content,
+            Function = message.FunctionName,
             RichContent = message.RichContent,
             Data = message.Data,
             Sender = new UserViewModel()