diff --git a/src/Duende.Bff.Blazor.Client/ServiceCollectionExtensions.cs b/src/Duende.Bff.Blazor.Client/ServiceCollectionExtensions.cs
index ae1970ea..c758bd71 100644
--- a/src/Duende.Bff.Blazor.Client/ServiceCollectionExtensions.cs
+++ b/src/Duende.Bff.Blazor.Client/ServiceCollectionExtensions.cs
@@ -118,7 +118,8 @@ private static void SetBaseAddress(IServiceProvider sp, HttpClient client)
     /// <param name="clientName">The name of that <see cref="HttpClient"/> to
     /// configure. A common use case is to use the same named client in multiple
     /// render contexts that are automatically switched between via interactive
-    /// render modes.</param>
+    /// render modes. In that case, ensure both the client and server project
+    /// define the HttpClient appropriately.</param>
     /// <param name="configureClient">A configuration callback used to set up
     /// the <see cref="HttpClient"/>.</param>
     public static IHttpClientBuilder AddRemoteApiHttpClient(this IServiceCollection services, string clientName,
@@ -136,7 +137,8 @@ public static IHttpClientBuilder AddRemoteApiHttpClient(this IServiceCollection
     /// <param name="clientName">The name of that <see cref="HttpClient"/> to
     /// configure. A common use case is to use the same named client in multiple
     /// render contexts that are automatically switched between via interactive
-    /// render modes.</param>
+    /// render modes. In that case, ensure both the client and server project
+    /// define the HttpClient appropriately.</param>
     /// <param name="configureClient">A configuration callback used to set up
     /// the <see cref="HttpClient"/>.</param>
     public static IHttpClientBuilder AddRemoteApiHttpClient(this IServiceCollection services, string clientName,
@@ -146,7 +148,17 @@ public static IHttpClientBuilder AddRemoteApiHttpClient(this IServiceCollection
             .AddHttpMessageHandler<AntiforgeryHandler>();
     }
 
-    // TODO - Manually test this API.
+    /// <summary>
+    /// Adds a typed <see cref="HttpClient"/> for use when invoking remote APIs
+    /// proxied through Duende.Bff and configures the client with a callback.
+    /// </summary>
+    /// <param name="clientName">The name of that <see cref="HttpClient"/> to
+    /// configure. A common use case is to use the same named client in multiple
+    /// render contexts that are automatically switched between via interactive
+    /// render modes. In that case, ensure both the client and server project
+    /// define the HttpClient appropriately.</param>
+    /// <param name="configureClient">A configuration callback used to set up
+    /// the <see cref="HttpClient"/>.</param>
     public static IHttpClientBuilder AddRemoteApiHttpClient<T>(this IServiceCollection services,
         Action<HttpClient> configureClient)
         where T : class
@@ -155,6 +167,18 @@ public static IHttpClientBuilder AddRemoteApiHttpClient<T>(this IServiceCollecti
             .AddHttpMessageHandler<AntiforgeryHandler>();
     }
 
+    /// <summary>
+    /// Adds a typed <see cref="HttpClient"/> for use when invoking remote APIs
+    /// proxied through Duende.Bff and configures the client with a callback
+    /// that has access to the underlying service provider.
+    /// </summary>
+    /// <param name="clientName">The name of that <see cref="HttpClient"/> to
+    /// configure. A common use case is to use the same named client in multiple
+    /// render contexts that are automatically switched between via interactive
+    /// render modes. In that case, ensure both the client and server project
+    /// define the HttpClient appropriately.</param>
+    /// <param name="configureClient">A configuration callback used to set up
+    /// the <see cref="HttpClient"/>.</param>
     public static IHttpClientBuilder AddRemoteApiHttpClient<T>(this IServiceCollection services,
         Action<IServiceProvider, HttpClient>? configureClient = null)
         where T : class