diff --git a/src/containers/PageConstructor/__stories__/components/CustomCard/CustomCard.tsx b/src/containers/PageConstructor/__stories__/components/CustomCard/CustomCard.tsx
index c545d439c..e3fec7e3f 100644
--- a/src/containers/PageConstructor/__stories__/components/CustomCard/CustomCard.tsx
+++ b/src/containers/PageConstructor/__stories__/components/CustomCard/CustomCard.tsx
@@ -69,7 +69,7 @@ export const CustomCard = ({
                             onClick={(e) => e.stopPropagation()}
                         >
                             <YFMWrapper
-                                className={b('card-body-link-code')}
+                                contentClassName={b('card-body-link-code')}
                                 content={`<code>${content}</code>`}
                             />
                         </Link>
@@ -91,8 +91,9 @@ export const CustomCard = ({
                     <CardBase.Content>
                         {description && (
                             <YFMWrapper
-                                className={b('card-body-description')}
+                                contentClassName={b('card-body-description')}
                                 content={yfmTransform(description)}
+                                tagName="div"
                             />
                         )}
                     </CardBase.Content>
diff --git a/src/containers/PageConstructor/__stories__/components/CustomDecorator/CustomDecorator.tsx b/src/containers/PageConstructor/__stories__/components/CustomDecorator/CustomDecorator.tsx
index cddde8141..f5df3693c 100644
--- a/src/containers/PageConstructor/__stories__/components/CustomDecorator/CustomDecorator.tsx
+++ b/src/containers/PageConstructor/__stories__/components/CustomDecorator/CustomDecorator.tsx
@@ -55,7 +55,7 @@ export const customDecorator: BlockDecorator = ({type, children}) => {
                     <YFMWrapper content={yfmTransform(CUSTOM_DECORATOR_DESCRIPTION)} />
                     <Link href="https://github.com/gravity-ui/page-constructor/blob/main/src/containers/PageConstructor/__stories__/components/CustomBlocksTemplate.tsx">
                         <YFMWrapper
-                            className={b('code')}
+                            contentClassName={b('code')}
                             content={`<code>${CUSTOM_DECORATOR_CODE}</code>`}
                         />
                     </Link>
diff --git a/src/containers/PageConstructor/__stories__/components/CustomHeader/CustomHeader.tsx b/src/containers/PageConstructor/__stories__/components/CustomHeader/CustomHeader.tsx
index bca2e2f09..90a405eec 100644
--- a/src/containers/PageConstructor/__stories__/components/CustomHeader/CustomHeader.tsx
+++ b/src/containers/PageConstructor/__stories__/components/CustomHeader/CustomHeader.tsx
@@ -43,7 +43,7 @@ export const CustomHeader = ({url, description, ...props}: CustomHeaderProps) =>
         >
             <Wrapper className={b('code')} href={url ?? ''}>
                 <YFMWrapper
-                    className={b('code-yfm')}
+                    contentClassName={b('code-yfm')}
                     content={`<code>${CUSTOM_HEADER_CODE}</code>`}
                 />
             </Wrapper>
diff --git a/src/containers/PageConstructor/__stories__/components/CustomNavigationItem/CustomNavigationItem.tsx b/src/containers/PageConstructor/__stories__/components/CustomNavigationItem/CustomNavigationItem.tsx
index c2da9cabe..c46f1b282 100644
--- a/src/containers/PageConstructor/__stories__/components/CustomNavigationItem/CustomNavigationItem.tsx
+++ b/src/containers/PageConstructor/__stories__/components/CustomNavigationItem/CustomNavigationItem.tsx
@@ -43,8 +43,9 @@ export const CustomNavigationItem = ({url, title, description}: CustomNavigation
                 <div className={b('popover-content')}>
                     {description && (
                         <YFMWrapper
-                            className={b('popover-content-description')}
+                            contentClassName={b('popover-content-description')}
                             content={yfmTransform(description)}
+                            tagName="div"
                         />
                     )}
                     <Wrapper className={b('popover-content-code')} href={url ?? ''}>