diff --git a/src/Infrastructure/BotSharp.Abstraction/Http/IHttpRequestHook.cs b/src/Infrastructure/BotSharp.Abstraction/Http/IHttpRequestHook.cs
new file mode 100644
index 00000000..18b96e77
--- /dev/null
+++ b/src/Infrastructure/BotSharp.Abstraction/Http/IHttpRequestHook.cs
@@ -0,0 +1,8 @@
+using System.Net.Http.Headers;
+
+namespace BotSharp.Abstraction.Http;
+
+public interface IHttpRequestHook
+{
+    void OnAddHttpHeaders(HttpHeaders headers);
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/Users/IAuthenticationHook.cs b/src/Infrastructure/BotSharp.Abstraction/Users/IAuthenticationHook.cs
index d953271f..939d509e 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Users/IAuthenticationHook.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Users/IAuthenticationHook.cs
@@ -1,5 +1,4 @@
 using BotSharp.Abstraction.Users.Models;
-using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 
 namespace BotSharp.Abstraction.Users;
diff --git a/src/Plugins/BotSharp.Plugin.HttpHandler/Functions/HandleHttpRequestFn.cs b/src/Plugins/BotSharp.Plugin.HttpHandler/Functions/HandleHttpRequestFn.cs
index f9a4342c..52f5075b 100644
--- a/src/Plugins/BotSharp.Plugin.HttpHandler/Functions/HandleHttpRequestFn.cs
+++ b/src/Plugins/BotSharp.Plugin.HttpHandler/Functions/HandleHttpRequestFn.cs
@@ -1,5 +1,6 @@
 using System.Net.Http;
 using System.Net.Mime;
+using BotSharp.Abstraction.Http;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
@@ -13,7 +14,6 @@ public class HandleHttpRequestFn : IFunctionCallback
     private readonly IServiceProvider _services;
     private readonly ILogger<HandleHttpRequestFn> _logger;
     private readonly IHttpClientFactory _httpClientFactory;
-    private readonly IHttpContextAccessor _context;
     private readonly BotSharpOptions _options;
 
     public HandleHttpRequestFn(IServiceProvider services,
@@ -25,7 +25,6 @@ public class HandleHttpRequestFn : IFunctionCallback
         _services = services;
         _logger = logger;
         _httpClientFactory = httpClientFactory;
-        _context = context;
         _options = options;
     }
 
@@ -57,7 +56,7 @@ public class HandleHttpRequestFn : IFunctionCallback
         if (string.IsNullOrEmpty(url)) return null;
 
         using var client = _httpClientFactory.CreateClient();
-        AddRequestHeaders(client);
+        PrepareRequestHeaders(client);
 
         var (uri, request) = BuildHttpRequest(url, method, content);
         var response = await client.SendAsync(request);
@@ -69,18 +68,12 @@ public class HandleHttpRequestFn : IFunctionCallback
         return response;
     }
 
-    private void AddRequestHeaders(HttpClient client)
+    private void PrepareRequestHeaders(HttpClient client)
     {
-        var auth = $"{_context.HttpContext.Request.Headers["Authorization"]}";
-        var origin = $"{_context.HttpContext.Request.Headers["Origin"]}";
-
-        client.DefaultRequestHeaders.Add("Authorization", auth);
-
-        var settings = _services.GetRequiredService<HttpHandlerSettings>();
-        origin = !string.IsNullOrEmpty(origin) ? origin : settings.Origin;
-        if (!string.IsNullOrEmpty(origin))
+        var hooks = _services.GetServices<IHttpRequestHook>();
+        foreach (var hook in hooks)
         {
-            client.DefaultRequestHeaders.Add("Origin", origin);
+            hook.OnAddHttpHeaders(client.DefaultRequestHeaders);
         }
     }
 
diff --git a/src/Plugins/BotSharp.Plugin.HttpHandler/Hooks/BasicHttpRequestHook.cs b/src/Plugins/BotSharp.Plugin.HttpHandler/Hooks/BasicHttpRequestHook.cs
new file mode 100644
index 00000000..5de858f2
--- /dev/null
+++ b/src/Plugins/BotSharp.Plugin.HttpHandler/Hooks/BasicHttpRequestHook.cs
@@ -0,0 +1,40 @@
+using BotSharp.Abstraction.Http;
+using Microsoft.AspNetCore.Http;
+using System.Net.Http.Headers;
+
+namespace BotSharp.Plugin.HttpHandler.Hooks;
+
+public class BasicHttpRequestHook : IHttpRequestHook
+{
+    private readonly IServiceProvider _services;
+    private readonly IHttpContextAccessor _context;
+
+    private const string AUTHORIZATION = "Authorization";
+    private const string ORIGIN = "Origin";
+
+    public BasicHttpRequestHook(
+        IServiceProvider services,
+        IHttpContextAccessor context)
+    {
+        _services = services;
+        _context = context;
+    }
+
+    public void OnAddHttpHeaders(HttpHeaders headers)
+    {
+        var settings = _services.GetRequiredService<HttpHandlerSettings>();
+
+        var auth = $"{_context.HttpContext.Request.Headers[AUTHORIZATION]}";
+        if (!string.IsNullOrEmpty(auth))
+        {
+            headers.Add(AUTHORIZATION, auth);
+        }
+
+        var origin = $"{_context.HttpContext.Request.Headers[ORIGIN]}";
+        origin = !string.IsNullOrEmpty(settings.Origin) ? settings.Origin : origin;
+        if (!string.IsNullOrEmpty(origin))
+        {
+            headers.Add(ORIGIN, origin);
+        }
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.HttpHandler/HttpHandlerPlugin.cs b/src/Plugins/BotSharp.Plugin.HttpHandler/HttpHandlerPlugin.cs
index 9c8cab55..a3c85c0b 100644
--- a/src/Plugins/BotSharp.Plugin.HttpHandler/HttpHandlerPlugin.cs
+++ b/src/Plugins/BotSharp.Plugin.HttpHandler/HttpHandlerPlugin.cs
@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Agents;
+using BotSharp.Abstraction.Http;
 using BotSharp.Abstraction.Settings;
 using Microsoft.Extensions.Configuration;
 
@@ -21,5 +22,6 @@ public class HttpHandlerPlugin : IBotSharpPlugin
         });
 
         services.AddScoped<IAgentUtilityHook, HttpHandlerUtilityHook>();
+        services.AddScoped<IHttpRequestHook, BasicHttpRequestHook>();
     }
 }