diff --git a/crates/rhema-claw/src/handler.rs b/crates/rhema-claw/src/handler.rs
index 94439b5..569a08f 100644
--- a/crates/rhema-claw/src/handler.rs
+++ b/crates/rhema-claw/src/handler.rs
@@ -503,7 +503,7 @@ pub(crate) fn final_text(message: &Message) -> Option<String> {
         .iter()
         .filter_map(|content| match content {
             Content::Text(text) => Some(text.as_str()),
-            Content::ToolCall(_) | Content::ToolResult(_) => None,
+            Content::ToolCall(_) | Content::ToolResult(_) | Content::Image(_) => None,
         })
         .collect::<Vec<_>>()
         .join("");
diff --git a/crates/rhema-claw/src/interactive.rs b/crates/rhema-claw/src/interactive.rs
index 59cdd85..ae0e391 100644
--- a/crates/rhema-claw/src/interactive.rs
+++ b/crates/rhema-claw/src/interactive.rs
@@ -474,7 +474,7 @@ fn final_text(message: &Message) -> Option<String> {
         .iter()
         .filter_map(|content| match content {
             Content::Text(text) => Some(text.as_str()),
-            Content::ToolCall(_) | Content::ToolResult(_) => None,
+            Content::ToolCall(_) | Content::ToolResult(_) | Content::Image(_) => None,
         })
         .collect::<Vec<_>>()
         .join("");