diff --git a/TaxBaik.Web/Program.cs b/TaxBaik.Web/Program.cs
index 8dacc37..253eb5a 100644
--- a/TaxBaik.Web/Program.cs
+++ b/TaxBaik.Web/Program.cs
@@ -214,18 +214,15 @@ var apiBaseUrl = builder.Configuration["ApiClient:BaseUrl"]
 builder.Services.AddHttpClient<IAdminDashboardClient, AdminDashboardClient>(client =>
 {
     client.BaseAddress = new Uri(apiBaseUrl);
-})
-    .AddHttpMessageHandler<TokenRefreshHandler>();
+});
 builder.Services.AddHttpClient<IInquiryBrowserClient, InquiryBrowserClient>(client =>
 {
     client.BaseAddress = new Uri(apiBaseUrl);
-})
-    .AddHttpMessageHandler<TokenRefreshHandler>();
+});
 builder.Services.AddHttpClient<IClientBrowserClient, ClientBrowserClient>(client =>
 {
     client.BaseAddress = new Uri(apiBaseUrl);
-})
-    .AddHttpMessageHandler<TokenRefreshHandler>();
+});
 builder.Services.AddHttpClient<ITaxFilingBrowserClient, TaxFilingBrowserClient>(client =>
 {
     client.BaseAddress = new Uri(apiBaseUrl);
@@ -233,13 +230,11 @@ builder.Services.AddHttpClient<ITaxFilingBrowserClient, TaxFilingBrowserClient>(
 builder.Services.AddHttpClient<IFaqBrowserClient, FaqBrowserClient>(client =>
 {
     client.BaseAddress = new Uri(apiBaseUrl);
-})
-    .AddHttpMessageHandler<TokenRefreshHandler>();
+});
 builder.Services.AddHttpClient<IAnnouncementBrowserClient, AnnouncementBrowserClient>(client =>
 {
     client.BaseAddress = new Uri(apiBaseUrl);
-})
-    .AddHttpMessageHandler<TokenRefreshHandler>();
+});
 
 // Phase 5: Tax Accounting & CRM Browser Clients
 builder.Services.AddHttpClient<ITaxProfileBrowserClient, TaxProfileBrowserClient>(client =>
diff --git a/TaxBaik.Web/Services/AnnouncementBrowserClient.cs b/TaxBaik.Web/Services/AnnouncementBrowserClient.cs
index 7ab0b00..30270fd 100644
--- a/TaxBaik.Web/Services/AnnouncementBrowserClient.cs
+++ b/TaxBaik.Web/Services/AnnouncementBrowserClient.cs
@@ -29,10 +29,10 @@ public class AnnouncementBrowserClient : IAnnouncementBrowserClient
 
     private void EnsureAuthHeader()
     {
-        if (!string.IsNullOrEmpty(_tokenStore.AccessToken) && !_http.DefaultRequestHeaders.Contains("Authorization"))
-        {
+        if (!string.IsNullOrEmpty(_tokenStore.AccessToken))
             _http.DefaultRequestHeaders.Authorization = new("Bearer", _tokenStore.AccessToken);
-        }
+        else
+            _http.DefaultRequestHeaders.Authorization = null;
     }
 
     public async Task<IEnumerable<Announcement>> GetAllAsync(CancellationToken ct = default)
diff --git a/TaxBaik.Web/Services/ClientBrowserClient.cs b/TaxBaik.Web/Services/ClientBrowserClient.cs
index a47c484..41adcc3 100644
--- a/TaxBaik.Web/Services/ClientBrowserClient.cs
+++ b/TaxBaik.Web/Services/ClientBrowserClient.cs
@@ -34,10 +34,10 @@ public class ClientBrowserClient : IClientBrowserClient
 
     private void EnsureAuthHeader()
     {
-        if (!string.IsNullOrEmpty(_tokenStore.AccessToken) && !_http.DefaultRequestHeaders.Contains("Authorization"))
-        {
+        if (!string.IsNullOrEmpty(_tokenStore.AccessToken))
             _http.DefaultRequestHeaders.Authorization = new("Bearer", _tokenStore.AccessToken);
-        }
+        else
+            _http.DefaultRequestHeaders.Authorization = null;
     }
 
     public async Task<(IEnumerable<Client> Items, int Total)> GetPagedAsync(
diff --git a/TaxBaik.Web/Services/FaqBrowserClient.cs b/TaxBaik.Web/Services/FaqBrowserClient.cs
index 736b949..1ca1858 100644
--- a/TaxBaik.Web/Services/FaqBrowserClient.cs
+++ b/TaxBaik.Web/Services/FaqBrowserClient.cs
@@ -28,10 +28,10 @@ public class FaqBrowserClient : IFaqBrowserClient
 
     private void EnsureAuthHeader()
     {
-        if (!string.IsNullOrEmpty(_tokenStore.AccessToken) && !_http.DefaultRequestHeaders.Contains("Authorization"))
-        {
+        if (!string.IsNullOrEmpty(_tokenStore.AccessToken))
             _http.DefaultRequestHeaders.Authorization = new("Bearer", _tokenStore.AccessToken);
-        }
+        else
+            _http.DefaultRequestHeaders.Authorization = null;
     }
 
     public async Task<IEnumerable<Faq>> GetAllAsync(CancellationToken ct = default)
diff --git a/TaxBaik.Web/Services/InquiryBrowserClient.cs b/TaxBaik.Web/Services/InquiryBrowserClient.cs
index ce899c7..0f97dc7 100644
--- a/TaxBaik.Web/Services/InquiryBrowserClient.cs
+++ b/TaxBaik.Web/Services/InquiryBrowserClient.cs
@@ -33,10 +33,10 @@ public class InquiryBrowserClient : IInquiryBrowserClient
 
     private void EnsureAuthHeader()
     {
-        if (!string.IsNullOrEmpty(_tokenStore.AccessToken) && !_http.DefaultRequestHeaders.Contains("Authorization"))
-        {
+        if (!string.IsNullOrEmpty(_tokenStore.AccessToken))
             _http.DefaultRequestHeaders.Authorization = new("Bearer", _tokenStore.AccessToken);
-        }
+        else
+            _http.DefaultRequestHeaders.Authorization = null;
     }
 
     public async Task<(IEnumerable<Inquiry> Items, int Total)> GetPagedAsync(