diff --git a/ee/tabby-webserver/src/service/thread.rs b/ee/tabby-webserver/src/service/thread.rs
index fe7825cde260..3933cdd02b96 100644
--- a/ee/tabby-webserver/src/service/thread.rs
+++ b/ee/tabby-webserver/src/service/thread.rs
@@ -157,15 +157,18 @@ impl ThreadService for ThreadServiceImpl {
         message: &CreateMessageInput,
     ) -> Result<()> {
         let thread_id = thread_id.as_rowid()?;
-        let client_code = message.attachments.as_ref().map(|x| {
-            let code = x.code.iter().map(Into::into).collect::<Vec<_>>();
-            // If there are no code attachments, return None
-            if code.is_empty() {
-                None
-            } else {
-                Some(code)
-            }
-        }).flatten();
+        let client_code = message
+            .attachments
+            .as_ref()
+            .and_then(|x| {
+                let code = x.code.iter().map(Into::into).collect::<Vec<_>>();
+                // If there are no code attachments, return None
+                if code.is_empty() {
+                    None
+                } else {
+                    Some(code)
+                }
+            });
 
         self.db
             .create_thread_message(