diff --git a/DbFirst.BlazorWebApp/Program.cs b/DbFirst.BlazorWebApp/Program.cs
index e06db92..9955b35 100644
--- a/DbFirst.BlazorWebApp/Program.cs
+++ b/DbFirst.BlazorWebApp/Program.cs
@@ -13,33 +13,17 @@ builder.Services.AddScoped<ThemeState>();
 builder.Services.AddScoped<BandLayoutService>();
 
 var apiBaseUrl = builder.Configuration["ApiBaseUrl"];
-if (!string.IsNullOrWhiteSpace(apiBaseUrl))
+void ConfigureClient(HttpClient client)
 {
-    builder.Services.AddHttpClient<CatalogApiClient>(client =>
-    {
+    if (!string.IsNullOrWhiteSpace(apiBaseUrl))
         client.BaseAddress = new Uri(apiBaseUrl);
-    });
-    builder.Services.AddHttpClient<DashboardApiClient>(client =>
-    {
-        client.BaseAddress = new Uri(apiBaseUrl);
-    });
-    builder.Services.AddHttpClient<MassDataApiClient>(client =>
-    {
-        client.BaseAddress = new Uri(apiBaseUrl);
-    });
-    builder.Services.AddHttpClient<LayoutApiClient>(client =>
-    {
-        client.BaseAddress = new Uri(apiBaseUrl);
-    });
-}
-else
-{
-    builder.Services.AddHttpClient<CatalogApiClient>();
-    builder.Services.AddHttpClient<DashboardApiClient>();
-    builder.Services.AddHttpClient<MassDataApiClient>();
-    builder.Services.AddHttpClient<LayoutApiClient>();
 }
 
+builder.Services.AddHttpClient<CatalogApiClient>(ConfigureClient);
+builder.Services.AddHttpClient<DashboardApiClient>(ConfigureClient);
+builder.Services.AddHttpClient<MassDataApiClient>(ConfigureClient);
+builder.Services.AddHttpClient<LayoutApiClient>(ConfigureClient);
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.