diff --git a/wren-ui/src/components/pages/home/promptThread/AnswerResult.tsx b/wren-ui/src/components/pages/home/promptThread/AnswerResult.tsx
index cb5c5735c6..cd1ba04061 100644
--- a/wren-ui/src/components/pages/home/promptThread/AnswerResult.tsx
+++ b/wren-ui/src/components/pages/home/promptThread/AnswerResult.tsx
@@ -299,7 +299,12 @@ export default function AnswerResult(props: Props) {
                 className="mr-2"
                 onClick={() =>
                   onOpenSaveToKnowledgeModal(
-                    { question, sql },
+                    {
+                      question:
+                        threadResponse?.askingTask?.rephrasedQuestion ||
+                        question,
+                      sql,
+                    },
                     { isCreateMode: true },
                   )
                 }