diff --git a/DbFirst.BlazorWebApp/Services/CatalogApiClient.cs b/DbFirst.BlazorWebApp/Services/CatalogApiClient.cs
index 0c97a9f..a1ffc8d 100644
--- a/DbFirst.BlazorWebApp/Services/CatalogApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/CatalogApiClient.cs
@@ -14,20 +14,20 @@ public class CatalogApiClient : ICatalogApiClient
         _httpClient = httpClient;
     }
 
-    public async Task<List<CatalogReadDto>> GetAllAsync()
+    public async Task<List<CatalogReadDto>> GetAllAsync(CancellationToken ct = default)
     {
-        var result = await _httpClient.GetFromJsonAsync<List<CatalogReadDto>>(Endpoint);
+        var result = await _httpClient.GetFromJsonAsync<List<CatalogReadDto>>(Endpoint, ct);
         return result ?? new List<CatalogReadDto>();
     }
 
-    public async Task<CatalogReadDto?> GetByIdAsync(int id)
+    public async Task<CatalogReadDto?> GetByIdAsync(int id, CancellationToken ct = default)
     {
-        return await _httpClient.GetFromJsonAsync<CatalogReadDto>($"{Endpoint}/{id}");
+        return await _httpClient.GetFromJsonAsync<CatalogReadDto>($"{Endpoint}/{id}", ct);
     }
 
-    public async Task<ApiResult<CatalogReadDto?>> CreateAsync(CatalogWriteDto dto)
+    public async Task<ApiResult<CatalogReadDto?>> CreateAsync(CatalogWriteDto dto, CancellationToken ct = default)
     {
-        var response = await _httpClient.PostAsJsonAsync(Endpoint, dto);
+        var response = await _httpClient.PostAsJsonAsync(Endpoint, dto, ct);
         if (response.IsSuccessStatusCode)
         {
             var payload = await response.Content.ReadFromJsonAsync<CatalogReadDto>();
@@ -38,9 +38,9 @@ public class CatalogApiClient : ICatalogApiClient
         return ApiResult<CatalogReadDto?>.Fail(error);
     }
 
-    public async Task<ApiResult<bool>> UpdateAsync(int id, CatalogWriteDto dto)
+    public async Task<ApiResult<bool>> UpdateAsync(int id, CatalogWriteDto dto, CancellationToken ct = default)
     {
-        var response = await _httpClient.PutAsJsonAsync($"{Endpoint}/{id}", dto);
+        var response = await _httpClient.PutAsJsonAsync($"{Endpoint}/{id}", dto, ct);
         if (response.IsSuccessStatusCode)
         {
             return ApiResult<bool>.Ok(true);
@@ -50,9 +50,9 @@ public class CatalogApiClient : ICatalogApiClient
         return ApiResult<bool>.Fail(error);
     }
 
-    public async Task<ApiResult<bool>> DeleteAsync(int id)
+    public async Task<ApiResult<bool>> DeleteAsync(int id, CancellationToken ct = default)
     {
-        var response = await _httpClient.DeleteAsync($"{Endpoint}/{id}");
+        var response = await _httpClient.DeleteAsync($"{Endpoint}/{id}", ct);
         if (response.IsSuccessStatusCode)
         {
             return ApiResult<bool>.Ok(true);
diff --git a/DbFirst.BlazorWebApp/Services/DashboardApiClient.cs b/DbFirst.BlazorWebApp/Services/DashboardApiClient.cs
index 9ea41f8..da3e51f 100644
--- a/DbFirst.BlazorWebApp/Services/DashboardApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/DashboardApiClient.cs
@@ -13,9 +13,9 @@ public class DashboardApiClient : IDashboardApiClient
         _httpClient = httpClient;
     }
 
-    public async Task<List<DashboardInfoDto>> GetAllAsync()
+    public async Task<List<DashboardInfoDto>> GetAllAsync(CancellationToken ct = default)
     {
-        var result = await _httpClient.GetFromJsonAsync<List<DashboardInfoDto>>(Endpoint);
+        var result = await _httpClient.GetFromJsonAsync<List<DashboardInfoDto>>(Endpoint, ct);
         return result ?? new List<DashboardInfoDto>();
     }
 }
diff --git a/DbFirst.BlazorWebApp/Services/ICatalogApiClient.cs b/DbFirst.BlazorWebApp/Services/ICatalogApiClient.cs
index c307205..bd99820 100644
--- a/DbFirst.BlazorWebApp/Services/ICatalogApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/ICatalogApiClient.cs
@@ -4,9 +4,9 @@ namespace DbFirst.BlazorWebApp.Services;
 
 public interface ICatalogApiClient
 {
-    Task<List<CatalogReadDto>> GetAllAsync();
-    Task<CatalogReadDto?> GetByIdAsync(int id);
-    Task<ApiResult<CatalogReadDto?>> CreateAsync(CatalogWriteDto dto);
-    Task<ApiResult<bool>> UpdateAsync(int id, CatalogWriteDto dto);
-    Task<ApiResult<bool>> DeleteAsync(int id);
+    Task<List<CatalogReadDto>> GetAllAsync(CancellationToken ct = default);
+    Task<CatalogReadDto?> GetByIdAsync(int id, CancellationToken ct = default);
+    Task<ApiResult<CatalogReadDto?>> CreateAsync(CatalogWriteDto dto, CancellationToken ct = default);
+    Task<ApiResult<bool>> UpdateAsync(int id, CatalogWriteDto dto, CancellationToken ct = default);
+    Task<ApiResult<bool>> DeleteAsync(int id, CancellationToken ct = default);
 }
\ No newline at end of file
diff --git a/DbFirst.BlazorWebApp/Services/IDashboardApiClient.cs b/DbFirst.BlazorWebApp/Services/IDashboardApiClient.cs
index fba9d7b..cb77f3d 100644
--- a/DbFirst.BlazorWebApp/Services/IDashboardApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/IDashboardApiClient.cs
@@ -4,6 +4,6 @@ namespace DbFirst.BlazorWebApp.Services
 {
     public interface IDashboardApiClient
     {
-        Task<List<DashboardInfoDto>> GetAllAsync();
+        Task<List<DashboardInfoDto>> GetAllAsync(CancellationToken ct = default);
     }
 }
diff --git a/DbFirst.BlazorWebApp/Services/ILayoutApiClient.cs b/DbFirst.BlazorWebApp/Services/ILayoutApiClient.cs
index a39116e..a82ea8f 100644
--- a/DbFirst.BlazorWebApp/Services/ILayoutApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/ILayoutApiClient.cs
@@ -4,8 +4,8 @@ namespace DbFirst.BlazorWebApp.Services
 {
     public interface ILayoutApiClient
     {
-        Task<LayoutDto?> GetAsync(string layoutType, string layoutKey, string userName);
-        Task<LayoutDto> UpsertAsync(LayoutDto dto);
-        Task DeleteAsync(string layoutType, string layoutKey, string userName);
+        Task<LayoutDto?> GetAsync(string layoutType, string layoutKey, string userName, CancellationToken ct = default);
+        Task<LayoutDto> UpsertAsync(LayoutDto dto, CancellationToken ct = default);
+        Task DeleteAsync(string layoutType, string layoutKey, string userName, CancellationToken ct = default);
     }
 }
diff --git a/DbFirst.BlazorWebApp/Services/IMassDataApiClient.cs b/DbFirst.BlazorWebApp/Services/IMassDataApiClient.cs
index 13f3e95..4d23877 100644
--- a/DbFirst.BlazorWebApp/Services/IMassDataApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/IMassDataApiClient.cs
@@ -4,9 +4,9 @@ namespace DbFirst.BlazorWebApp.Services
 {
     public interface IMassDataApiClient
     {
-        Task<int> GetCountAsync();
-        Task<List<MassDataReadDto>> GetAllAsync(int? skip, int? take);
-        Task<ApiResult<MassDataReadDto?>> UpsertAsync(MassDataWriteDto dto);
-        Task<MassDataReadDto?> GetByCustomerNameAsync(string customerName);
+        Task<int> GetCountAsync(CancellationToken ct = default);
+        Task<List<MassDataReadDto>> GetAllAsync(int? skip, int? take, CancellationToken ct = default);
+        Task<ApiResult<MassDataReadDto?>> UpsertAsync(MassDataWriteDto dto, CancellationToken ct = default);
+        Task<MassDataReadDto?> GetByCustomerNameAsync(string customerName, CancellationToken ct = default);
     }
 }
diff --git a/DbFirst.BlazorWebApp/Services/LayoutApiClient.cs b/DbFirst.BlazorWebApp/Services/LayoutApiClient.cs
index ca83973..d1e5202 100644
--- a/DbFirst.BlazorWebApp/Services/LayoutApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/LayoutApiClient.cs
@@ -13,10 +13,10 @@ public class LayoutApiClient : ILayoutApiClient
         _httpClient = httpClient;
     }
 
-    public async Task<LayoutDto?> GetAsync(string layoutType, string layoutKey, string userName)
+    public async Task<LayoutDto?> GetAsync(string layoutType, string layoutKey, string userName, CancellationToken ct = default)
     {
         var url = $"{Endpoint}?layoutType={Uri.EscapeDataString(layoutType)}&layoutKey={Uri.EscapeDataString(layoutKey)}&userName={Uri.EscapeDataString(userName)}";
-        var response = await _httpClient.GetAsync(url);
+        var response = await _httpClient.GetAsync(url, ct);
         if (response.StatusCode == System.Net.HttpStatusCode.NotFound)
         {
             return null;
@@ -26,9 +26,9 @@ public class LayoutApiClient : ILayoutApiClient
         return await response.Content.ReadFromJsonAsync<LayoutDto>();
     }
 
-    public async Task<LayoutDto> UpsertAsync(LayoutDto dto)
+    public async Task<LayoutDto> UpsertAsync(LayoutDto dto, CancellationToken ct = default)
     {
-        var response = await _httpClient.PostAsJsonAsync(Endpoint, dto);
+        var response = await _httpClient.PostAsJsonAsync(Endpoint, dto, ct);
         if (!response.IsSuccessStatusCode)
         {
             var detail = await ApiClientHelper.ReadErrorAsync(response);
@@ -39,10 +39,10 @@ public class LayoutApiClient : ILayoutApiClient
         return payload ?? dto;
     }
 
-    public async Task DeleteAsync(string layoutType, string layoutKey, string userName)
+    public async Task DeleteAsync(string layoutType, string layoutKey, string userName, CancellationToken ct = default)
     {
         var url = $"{Endpoint}?layoutType={Uri.EscapeDataString(layoutType)}&layoutKey={Uri.EscapeDataString(layoutKey)}&userName={Uri.EscapeDataString(userName)}";
-        var response = await _httpClient.DeleteAsync(url);
+        var response = await _httpClient.DeleteAsync(url, ct);
         if (response.StatusCode == System.Net.HttpStatusCode.NotFound)
         {
             return;
diff --git a/DbFirst.BlazorWebApp/Services/MassDataApiClient.cs b/DbFirst.BlazorWebApp/Services/MassDataApiClient.cs
index 1f45682..f054252 100644
--- a/DbFirst.BlazorWebApp/Services/MassDataApiClient.cs
+++ b/DbFirst.BlazorWebApp/Services/MassDataApiClient.cs
@@ -13,13 +13,13 @@ public class MassDataApiClient : IMassDataApiClient
         _httpClient = httpClient;
     }
 
-    public async Task<int> GetCountAsync()
+    public async Task<int> GetCountAsync(CancellationToken ct = default)
     {
-        var result = await _httpClient.GetFromJsonAsync<int?>("api/massdata/count");
+        var result = await _httpClient.GetFromJsonAsync<int?>("api/massdata/count", ct);
         return result ?? 0;
     }
 
-    public async Task<List<MassDataReadDto>> GetAllAsync(int? skip, int? take)
+    public async Task<List<MassDataReadDto>> GetAllAsync(int? skip, int? take, CancellationToken ct = default)
     {
         var query = new List<string>();
         if (skip.HasValue)
@@ -32,13 +32,13 @@ public class MassDataApiClient : IMassDataApiClient
         }
 
         var url = query.Count == 0 ? Endpoint : $"{Endpoint}?{string.Join("&", query)}";
-        var result = await _httpClient.GetFromJsonAsync<List<MassDataReadDto>>(url);
+        var result = await _httpClient.GetFromJsonAsync<List<MassDataReadDto>>(url, ct);
         return result ?? new List<MassDataReadDto>();
     }
 
-    public async Task<ApiResult<MassDataReadDto?>> UpsertAsync(MassDataWriteDto dto)
+    public async Task<ApiResult<MassDataReadDto?>> UpsertAsync(MassDataWriteDto dto, CancellationToken ct = default)
     {
-        var response = await _httpClient.PostAsJsonAsync($"{Endpoint}/upsert", dto);
+        var response = await _httpClient.PostAsJsonAsync($"{Endpoint}/upsert", dto, ct);
         if (response.IsSuccessStatusCode)
         {
             var payload = await response.Content.ReadFromJsonAsync<MassDataReadDto>();
@@ -49,14 +49,14 @@ public class MassDataApiClient : IMassDataApiClient
         return ApiResult<MassDataReadDto?>.Fail(error);
     }
 
-    public async Task<MassDataReadDto?> GetByCustomerNameAsync(string customerName)
+    public async Task<MassDataReadDto?> GetByCustomerNameAsync(string customerName, CancellationToken ct = default)
     {
         if (string.IsNullOrWhiteSpace(customerName))
         {
             return null;
         }
 
-        var response = await _httpClient.GetAsync($"{Endpoint}/{Uri.EscapeDataString(customerName)}");
+        var response = await _httpClient.GetAsync($"{Endpoint}/{Uri.EscapeDataString(customerName)}", ct);
         if (response.StatusCode == System.Net.HttpStatusCode.NotFound)
         {
             return null;