diff --git a/front/lib/tokenization.ts b/front/lib/tokenization.ts
index 12dd5c7b0528..1d9f973dfed2 100644
--- a/front/lib/tokenization.ts
+++ b/front/lib/tokenization.ts
@@ -8,7 +8,7 @@ import config from "./api/config";
 
 export async function tokenCountForTexts(
   texts: string[],
-  model: { providerId: string; modelId: string }
+  model: { providerId: string; modelId: string; tokenCountAdjustment?: number }
 ): Promise<Result<Array<number>, Error>> {
   const BATCHES_COUNT = 3;
   try {
@@ -32,7 +32,9 @@ export async function tokenCountForTexts(
         );
       }
       for (const tokens of res.value.tokens) {
-        counts.push(tokens.length);
+        counts.push(
+          Math.round(tokens.length * (model.tokenCountAdjustment ?? 1))
+        );
       }
     }
 
diff --git a/types/src/front/lib/assistant.ts b/types/src/front/lib/assistant.ts
index 5647caf1352e..ef445c28fab7 100644
--- a/types/src/front/lib/assistant.ts
+++ b/types/src/front/lib/assistant.ts
@@ -201,6 +201,9 @@ export type ModelConfigurationType = {
   // This meta-prompt is injected into the assistant's system instructions if the assistant is in a tool-use context.
   toolUseMetaPrompt?: string;
 
+  // Adjust the token count estimation by a ratio. Only needed for anthropic models, where the token count is higher than our estimate
+  tokenCountAdjustment?: number;
+
   supportsVision: boolean;
 
   // Only used for O-series OpenAI models.
@@ -400,6 +403,7 @@ export const CLAUDE_3_OPUS_DEFAULT_MODEL_CONFIG: ModelConfigurationType = {
   delimitersConfiguration: ANTHROPIC_DELIMITERS_CONFIGURATION,
   supportsVision: true,
   toolUseMetaPrompt: ANTHROPIC_TOOL_USE_META_PROMPT,
+  tokenCountAdjustment: 1.15,
 };
 
 export const CLAUDE_3_5_SONNET_20240620_DEPRECATED_MODEL_CONFIG: ModelConfigurationType =
@@ -417,6 +421,7 @@ export const CLAUDE_3_5_SONNET_20240620_DEPRECATED_MODEL_CONFIG: ModelConfigurat
     delimitersConfiguration: ANTHROPIC_DELIMITERS_CONFIGURATION,
     supportsVision: true,
     toolUseMetaPrompt: ANTHROPIC_TOOL_USE_META_PROMPT,
+    tokenCountAdjustment: 1.15,
   };
 
 export const CLAUDE_3_5_SONNET_DEFAULT_MODEL_CONFIG: ModelConfigurationType = {
@@ -433,6 +438,7 @@ export const CLAUDE_3_5_SONNET_DEFAULT_MODEL_CONFIG: ModelConfigurationType = {
   delimitersConfiguration: ANTHROPIC_DELIMITERS_CONFIGURATION,
   supportsVision: true,
   toolUseMetaPrompt: ANTHROPIC_TOOL_USE_META_PROMPT,
+  tokenCountAdjustment: 1.15,
 };
 export const CLAUDE_3_5_HAIKU_DEFAULT_MODEL_CONFIG: ModelConfigurationType = {
   providerId: "anthropic",
@@ -447,6 +453,7 @@ export const CLAUDE_3_5_HAIKU_DEFAULT_MODEL_CONFIG: ModelConfigurationType = {
   shortDescription: "Anthropic's cost-effective model.",
   isLegacy: false,
   supportsVision: false,
+  tokenCountAdjustment: 1.15,
 };
 export const CLAUDE_3_HAIKU_DEFAULT_MODEL_CONFIG: ModelConfigurationType = {
   providerId: "anthropic",
@@ -461,6 +468,7 @@ export const CLAUDE_3_HAIKU_DEFAULT_MODEL_CONFIG: ModelConfigurationType = {
   shortDescription: "Anthropic's cost-effective model.",
   isLegacy: false,
   supportsVision: true,
+  tokenCountAdjustment: 1.15,
 };
 export const CLAUDE_2_DEFAULT_MODEL_CONFIG: ModelConfigurationType = {
   providerId: "anthropic",