From 955a05c590214004ec062946fb0053d04c71f52a Mon Sep 17 00:00:00 2001
From: Michal Nowak <michal.nowak@hycom.pl>
Date: Tue, 21 Apr 2026 16:05:07 +0200
Subject: [PATCH] fix(ui): [Bug] Rich text nested paragraph causes Next.js
 hydration errors on article page #779

---
 .changeset/sad-lies-kick.md                              | 5 +++++
 packages/ui/src/components/Content/RichText/RichText.tsx | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .changeset/sad-lies-kick.md

diff --git a/.changeset/sad-lies-kick.md b/.changeset/sad-lies-kick.md
new file mode 100644
index 000000000..76ba436d9
--- /dev/null
+++ b/.changeset/sad-lies-kick.md
@@ -0,0 +1,5 @@
+---
+'@o2s/ui': patch
+---
+
+fix(ui): use div instead of p tag in RichText paragraph override to prevent hydration errors from nested block-level elements
diff --git a/packages/ui/src/components/Content/RichText/RichText.tsx b/packages/ui/src/components/Content/RichText/RichText.tsx
index 0674e4c6d..31ea27471 100644
--- a/packages/ui/src/components/Content/RichText/RichText.tsx
+++ b/packages/ui/src/components/Content/RichText/RichText.tsx
@@ -135,6 +135,7 @@ export const RichText: FC<Readonly<RichTextProps>> = ({
             component: TypographyComp,
             props: {
                 variant: baseFontSize,
+                tag: 'div',
                 className: cn('[&:not(:first-child)]:mt-6', className),
             },
         },