diff --git a/.changeset/twelve-pumpkins-sit.md b/.changeset/twelve-pumpkins-sit.md
new file mode 100644
index 0000000000..57e50230bf
--- /dev/null
+++ b/.changeset/twelve-pumpkins-sit.md
@@ -0,0 +1,7 @@
+---
+"roo-cline": patch
+---
+
+Changes maxTokens to 8192 for anthropic models that supports it
+anthropic/claude-3-sonnet, claude-3-opus, claude-3-haiku supports maxTokens of 4096.
+This change keeps the max tokens the same for those models
diff --git a/src/api/providers/unbound.ts b/src/api/providers/unbound.ts
index 38cd494cdd..f83ecd457b 100644
--- a/src/api/providers/unbound.ts
+++ b/src/api/providers/unbound.ts
@@ -212,7 +212,10 @@ export async function getUnboundModels() {
 
 				switch (true) {
 					case modelId.startsWith("anthropic/"):
-						modelInfo.maxTokens = 8192
+						// Set max tokens to 8192 for supported Anthropic models
+						if (modelInfo.maxTokens !== 4096) {
+							modelInfo.maxTokens = 8192
+						}
 						break
 					default:
 						break