diff --git a/crates/goose-llm/src/providers/databricks.rs b/crates/goose-llm/src/providers/databricks.rs
index 13e0c1a2b980..7b91d6a26afa 100644
--- a/crates/goose-llm/src/providers/databricks.rs
+++ b/crates/goose-llm/src/providers/databricks.rs
@@ -138,6 +138,8 @@ impl DatabricksProvider {
                     "reduce the length",
                     "token count",
                     "exceeds",
+                    "exceed context limit",
+                    "max_tokens",
                 ];
                 if check_phrases.iter().any(|c| payload_str.contains(c)) {
                     return Err(ProviderError::ContextLengthExceeded(payload_str));
diff --git a/crates/goose/src/providers/databricks.rs b/crates/goose/src/providers/databricks.rs
index 7a04407a829c..bdca16bb5aa9 100644
--- a/crates/goose/src/providers/databricks.rs
+++ b/crates/goose/src/providers/databricks.rs
@@ -211,6 +211,8 @@ impl DatabricksProvider {
                     "reduce the length",
                     "token count",
                     "exceeds",
+                    "exceed context limit",
+                    "max_tokens",
                 ];
                 if check_phrases.iter().any(|c| payload_str.contains(c)) {
                     return Err(ProviderError::ContextLengthExceeded(payload_str));
diff --git a/crates/goose/src/providers/snowflake.rs b/crates/goose/src/providers/snowflake.rs
index dcd0ac444bd7..f1c3ad10a603 100644
--- a/crates/goose/src/providers/snowflake.rs
+++ b/crates/goose/src/providers/snowflake.rs
@@ -333,6 +333,8 @@ impl SnowflakeProvider {
                     "reduce the length",
                     "token count",
                     "exceeds",
+                    "exceed context limit",
+                    "max_tokens",
                 ];
                 if check_phrases.iter().any(|c| payload_str.contains(c)) {
                     return Err(ProviderError::ContextLengthExceeded("Request exceeds maximum context length. Please reduce the number of messages or content size.".to_string()));