diff --git a/src/Infrastructure/BotSharp.Core/Templating/ResponseTemplateService.cs b/src/Infrastructure/BotSharp.Core/Templating/ResponseTemplateService.cs
index cb536e0e..6bde9ce6 100644
--- a/src/Infrastructure/BotSharp.Core/Templating/ResponseTemplateService.cs
+++ b/src/Infrastructure/BotSharp.Core/Templating/ResponseTemplateService.cs
@@ -35,6 +35,10 @@ public class ResponseTemplateService : IResponseTemplateService
         // Convert args and execute data to dictionary
         var dict = new Dictionary<string, object>();
 
+        // Populate states
+        var state = _services.GetRequiredService<IConversationStateService>();
+        state.GetStates().Select(x => dict[x.Key] = x.Value).ToList();
+
         if (message.FunctionArgs != null)
         {
             ExtractArgs(JsonSerializer.Deserialize<JsonDocument>(message.FunctionArgs), dict);