diff --git a/src/components/Editor/extensions/Figure.ts b/src/components/Editor/extensions/Figure.ts
index f1dca237..c4fd4565 100644
--- a/src/components/Editor/extensions/Figure.ts
+++ b/src/components/Editor/extensions/Figure.ts
@@ -67,7 +67,8 @@ export const Figure = Node.create<FigureOptions>({
     return [
       {
         tag: 'figure',
-        contentElement: 'figcaption'
+        contentElement: (dom: HTMLElement) =>
+          dom.querySelector('figcaption') ?? document.createElement('figcaption')
       }
     ]
   },