diff --git a/src/app/components/ContextUsageIndicator.tsx b/src/app/components/ContextUsageIndicator.tsx
index 2b6cef4..e7c60f6 100644
--- a/src/app/components/ContextUsageIndicator.tsx
+++ b/src/app/components/ContextUsageIndicator.tsx
@@ -7,7 +7,7 @@ import {
   type ContextUsageEvent,
 } from "@/lib/contextUsage";
 import { cn } from "@/lib/utils";
-import { useTranslations } from "next-intl";
+import { useTranslations, useFormatter } from "next-intl";
 
 /**
  * Live context-occupancy pill.
@@ -24,6 +24,7 @@ export const ContextUsageIndicator = React.memo<{
   measuredTokens: number | null;
 }>(function ContextUsageIndicator({ usage, measuredTokens }) {
   const t = useTranslations("chat");
+  const format = useFormatter();
   if (!usage) return null;
   const estimated = usage.usedTokens + usage.reservedTokens;
   const occupied = measuredTokens ?? estimated;
@@ -37,9 +38,9 @@ export const ContextUsageIndicator = React.memo<{
     limit: formatCompactTokens(limit),
   });
   const tooltipParams = {
-    used: occupied.toLocaleString(),
-    limit: limit.toLocaleString(),
-    soft: usage.softTokens.toLocaleString(),
+    used: format.number(occupied),
+    limit: format.number(limit),
+    soft: format.number(usage.softTokens),
   };
   const tooltip =
     measuredTokens !== null