diff --git a/rag/svr/task_executor_refactor/dataflow_service.py b/rag/svr/task_executor_refactor/dataflow_service.py
index 5491c9cb73..447a8f5590 100644
--- a/rag/svr/task_executor_refactor/dataflow_service.py
+++ b/rag/svr/task_executor_refactor/dataflow_service.py
@@ -326,7 +326,7 @@ class DataflowService:
                 del ck["metadata"]
 
             if "content_with_weight" not in ck:
-                ck["content_with_weight"] = ck["text"]
+                ck["content_with_weight"] = ck["text"] or ""
             del ck["text"]
 
             if "positions" in ck:
diff --git a/rag/utils/infinity_conn.py b/rag/utils/infinity_conn.py
index a8e68d682d..b57acb5d41 100644
--- a/rag/utils/infinity_conn.py
+++ b/rag/utils/infinity_conn.py
@@ -496,6 +496,10 @@ class InfinityConnection(InfinityConnectionBase):
                             d[k] = v if v else "{}"
                     else:
                         d[k] = v
+                # Infinity thrift client does not accept None values.
+                for k in list(d.keys()):
+                    if d[k] is None:
+                        del d[k]
                 for k in [
                     "docnm_kwd",
                     "title_tks",