diff --git a/backend/internal/repository/gateway_cache.go b/backend/internal/repository/gateway_cache.go
index 6fed5b6874..6ca8319e44 100644
--- a/backend/internal/repository/gateway_cache.go
+++ b/backend/internal/repository/gateway_cache.go
@@ -188,9 +188,7 @@ func (c *gatewayCache) GetAccountAffinityCountBatch(ctx context.Context, account
 		if err != nil && err != redis.Nil {
 			continue
 		}
-		if count > 0 {
-			result[id] = count
-		}
+		result[id] = count
 	}
 	return result, nil
 }
diff --git a/frontend/src/components/account/AccountStatusIndicator.vue b/frontend/src/components/account/AccountStatusIndicator.vue
index 3a8d632f42..4465cff482 100644
--- a/frontend/src/components/account/AccountStatusIndicator.vue
+++ b/frontend/src/components/account/AccountStatusIndicator.vue
@@ -2,7 +2,7 @@
   <div class="flex items-center gap-2">
     <!-- Affinity Client Count Badge -->
     <div
-      v-if="affinityClientCount > 0"
+      v-if="account.client_affinity_enabled"
       class="group/affinity relative"
       @mouseenter="loadAffinityClients"
     >