diff --git a/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx
index 2e1814d4b3..3e0d532a16 100644
--- a/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx
+++ b/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx
@@ -44,11 +44,10 @@ ReadPretty.TextArea = (props) => {
     />
   );
   console.log('value', value);
-  const content = (
-    <EllipsisWithTooltip ellipsis={ellipsis} popoverContent={autop ? html : value}>
-      {ellipsis ? text || value : html}
-    </EllipsisWithTooltip>
-  );
+  const content = ellipsis ?
+    (<EllipsisWithTooltip ellipsis={ellipsis} popoverContent={autop ? html : value}>
+      {text}
+    </EllipsisWithTooltip>) : value || html;
   return (
     <div className={cls(prefixCls, props.className)} style={props.style}>
       {props.addonBefore}
diff --git a/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx b/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx
index 9d210081f5..436484f81e 100644
--- a/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx
+++ b/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx
@@ -20,8 +20,8 @@ export const Markdown: any = connect(
   }),
   mapReadPretty((props) => {
     let text = convertToText(props.value);
-    let value = <div className={'nb-markdown'} dangerouslySetInnerHTML={{ __html: markdown(text) }} />;
-    return <InputReadPretty.TextArea {...props} text={text} value={value} />;
+    let value = <div className={'nb-markdown'} dangerouslySetInnerHTML={{ __html: markdown(props.value) }} />;
+    return <InputReadPretty.TextArea {...props} autop={false} text={text} value={value} />;
   }),
 );