diff --git a/crates/utils/src/utils.rs b/crates/utils/src/utils.rs
index 2b28ae0ea..a1fefffe8 100644
--- a/crates/utils/src/utils.rs
+++ b/crates/utils/src/utils.rs
@@ -176,7 +176,16 @@ pub fn clean_url_params(mut url: Url) -> Url {
 }
 
 pub fn clean_optional_text(text: &Option<String>) -> Option<String> {
-  text.as_ref().map(|t| t.trim().to_string())
+  if let Some(text) = text {
+    let trimmed = text.trim();
+    if trimmed.is_empty() {
+      None
+    } else {
+      Some(trimmed.to_owned())
+    }
+  } else {
+    None
+  }
 }
 
 #[cfg(test)]