diff --git a/src/renderer/src/pages/home/Markdown/Markdown.tsx b/src/renderer/src/pages/home/Markdown/Markdown.tsx
index 08ea9f67..0448b94e 100644
--- a/src/renderer/src/pages/home/Markdown/Markdown.tsx
+++ b/src/renderer/src/pages/home/Markdown/Markdown.tsx
@@ -18,6 +18,9 @@ import CodeBlock from './CodeBlock'
 import ImagePreview from './ImagePreview'
 import Link from './Link'
 
+const ALLOWED_ELEMENTS =
+  /<(style|p|div|span|b|i|strong|em|ul|ol|li|table|tr|td|th|thead|tbody|h[1-6]|blockquote|pre|code|br|hr)/i
+
 interface Props {
   message: Message
 }
@@ -36,8 +39,8 @@ const Markdown: FC<Props> = ({ message }) => {
   }, [message.content, message.status, t])
 
   const rehypePlugins = useMemo(() => {
-    const hasUnsafeElements = /<(input|textarea|select|menuitem)/i.test(messageContent)
-    return hasUnsafeElements ? [rehypeMath] : [rehypeRaw, rehypeMath]
+    const hasElements = ALLOWED_ELEMENTS.test(messageContent)
+    return hasElements ? [rehypeRaw, rehypeMath] : [rehypeMath]
   }, [messageContent, rehypeMath])
 
   if (message.role === 'user' && !renderInputMessageAsMarkdown) {
diff --git a/src/renderer/src/pages/settings/ProviderSettings/index.tsx b/src/renderer/src/pages/settings/ProviderSettings/index.tsx
index 9f9fc29f..3d97ff45 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/index.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/index.tsx
@@ -181,7 +181,7 @@ const ProviderListItem = styled.div`
   align-items: center;
   padding: 5px 8px;
   width: 100%;
-  cursor: pointer;
+  cursor: grab;
   border-radius: 5px;
   font-size: 14px;
   transition: all 0.2s ease-in-out;
diff --git a/src/renderer/src/store/settings.ts b/src/renderer/src/store/settings.ts
index df076075..503f183c 100644
--- a/src/renderer/src/store/settings.ts
+++ b/src/renderer/src/store/settings.ts
@@ -56,7 +56,7 @@ const initialState: SettingsState = {
   pasteLongTextAsFile: false,
   clickAssistantToShowTopic: false,
   manualUpdateCheck: false,
-  renderInputMessageAsMarkdown: true,
+  renderInputMessageAsMarkdown: false,
   codeShowLineNumbers: false,
   codeCollapsible: false,
   mathEngine: 'MathJax',