diff --git a/api/apps/chunk_app.py b/api/apps/chunk_app.py
index 0458160b28505b38fe53733b284284d37ba79de6..b3cf11aa1d9decd164efd9f3580cb52f003388ae 100644
--- a/api/apps/chunk_app.py
+++ b/api/apps/chunk_app.py
@@ -60,7 +60,7 @@ def list():
         for id in sres.ids:
             d = {
                 "chunk_id": id,
-                "content_with_weight": rmSpace(sres.highlight[id]) if question else sres.field[id].get(
+                "content_with_weight": rmSpace(sres.highlight[id]) if question and id in sres.highlight else sres.field[id].get(
                     "content_with_weight", ""),
                 "doc_id": sres.field[id]["doc_id"],
                 "docnm_kwd": sres.field[id]["docnm_kwd"],
diff --git a/api/apps/conversation_app.py b/api/apps/conversation_app.py
index 8c42c804bffb857f34c880518807019f152499b9..1d9894383b07c1edca90ff5c8f71c4713952448d 100644
--- a/api/apps/conversation_app.py
+++ b/api/apps/conversation_app.py
@@ -241,7 +241,7 @@ def chat(dialog, messages, **kwargs):
     chat_logger.info("User: {}|Assistant: {}".format(
         msg[-1]["content"], answer))
 
-    if knowledges:
+    if knowledges and prompt_config.get("quote", True):
         answer, idx = retrievaler.insert_citations(answer,
                                                    [ck["content_ltks"]
                                                        for ck in kbinfos["chunks"]],