diff --git a/src/Base/AiProviderClientBase.php b/src/Base/AiProviderClientBase.php
index 633efa305e14fa15ed6c56aeecba92ca0ba128a1..08a6b0dac54724b80dd1effc4e8e2b68e980913e 100644
--- a/src/Base/AiProviderClientBase.php
+++ b/src/Base/AiProviderClientBase.php
@@ -202,7 +202,7 @@ abstract class AiProviderClientBase implements AiProviderInterface, ContainerFac
     $this->eventDispatcher = $event_dispatcher;
     $this->pluginDefinition = $plugin_definition;
     $this->pluginId = $plugin_id;
-    $this->httpClient = $this->getHttpClient();
+    $this->httpClient = $this->getHttpClient() ?? $http_client;
     $this->configFactory = $config_factory;
     $this->loggerFactory = $logger_factory;
     $this->moduleHandler = $module_handler;
diff --git a/src/Event/HttpClientCreationEvent.php b/src/Event/HttpClientCreationEvent.php
index fe6b9ee1889f29979fcc3e0b5d013b17dcde1e11..7308df28c207deb6a239ce587627d2697c957e71 100644
--- a/src/Event/HttpClientCreationEvent.php
+++ b/src/Event/HttpClientCreationEvent.php
@@ -20,14 +20,14 @@ class HttpClientCreationEvent extends Event {
   protected $providerId;
 
   /**
-   * The (optional) operation type for the request.
+   * The (optional) operation type for the client.
    *
    * @var string
    */
   protected $operationType = '';
 
   /**
-   * The (optional) model ID for the request.
+   * The (optional) model ID for the client.
    *
    * @var string
    */
@@ -48,9 +48,9 @@ class HttpClientCreationEvent extends Event {
    * @param array $configuration
    *   The configuration for the client.
    * @param string $operation_type
-   *   The operation type for the request.
+   *   The operation type for the client.
    * @param string $model_id
-   *   The model ID for the request.
+   *   The model ID for the client.
    */
   public function __construct(string $provider_id, array $configuration, string $operation_type, string $model_id) {
     $this->providerId = $provider_id;