diff --git a/packages/ui/src/components/Highlight/Highlight.tsx b/packages/ui/src/components/Highlight/Highlight.tsx
index fcb0384e4..fff9602bd 100644
--- a/packages/ui/src/components/Highlight/Highlight.tsx
+++ b/packages/ui/src/components/Highlight/Highlight.tsx
@@ -13,16 +13,17 @@ interface HighlightProps {
 export const Highlight: React.FC<HighlightProps> = ({ language, text }) => {
   const [code, setCode] = useState<string>('');
 
-  const textToCode = async () => {
-    setCode(await asyncHighlight(text as string, language));
-  };
-
-  useEffect(() => {
-    textToCode();
-  }, []);
-
   useEffect(() => {
-    textToCode();
+    let unmount = false;
+    asyncHighlight(text as string, language).then((newCode) => {
+      if (!unmount) {
+        setCode(newCode);
+      }
+    });
+
+    return () => {
+      unmount = true;
+    };
   }, [language, text]);
 
   const handleCopyClick = () => {
@@ -35,10 +36,7 @@ export const Highlight: React.FC<HighlightProps> = ({ language, text }) => {
         <code className={cn('hljs', language)} dangerouslySetInnerHTML={{ __html: code }} />
       </pre>
 
-      <Button
-        onClick={handleCopyClick}
-        className={s.copyBtn}
-      >
+      <Button onClick={handleCopyClick} className={s.copyBtn}>
         <CopyIcon />
       </Button>
     </div>