@@ -1,3 +1,4 @@
+import { useEffect, useState } from 'react'
 import DsMarkdown, { ConfigProvider } from 'ds-markdown'
 import { katexPlugin } from 'ds-markdown/plugins'
 
@@ -13,16 +14,26 @@ interface DsMarkdownContentProps {
 const STREAMING_INTERVAL = 20
 
 export function DsMarkdownContent({ content, streaming }: DsMarkdownContentProps) {
+	const [isTypingComplete, setIsTypingComplete] = useState(!streaming)
+	const typingEnabled = streaming || !isTypingComplete
+
+	useEffect(() => {
+		if (streaming) {
+			setIsTypingComplete(false)
+		}
+	}, [streaming])
+
 	return (
 		<ConfigProvider locale={ruRU}>
 			<DsMarkdown
 				theme='dark'
 				answerType='answer'
-				disableTyping={!streaming}
+				disableTyping={!typingEnabled}
 				interval={STREAMING_INTERVAL}
-				showCursor={streaming}
+				showCursor={typingEnabled}
 				plugins={[katexPlugin]}
 				math={{ splitSymbol: 'bracket' }}
+				onEnd={() => setIsTypingComplete(true)}
 			>
 				{content}
 			</DsMarkdown>