diff --git a/src/bundle/Resources/richtext/stylesheets/xhtml5/edit/docbook.xsl b/src/bundle/Resources/richtext/stylesheets/xhtml5/edit/docbook.xsl
index 560082e0..1ffbbb5b 100644
--- a/src/bundle/Resources/richtext/stylesheets/xhtml5/edit/docbook.xsl
+++ b/src/bundle/Resources/richtext/stylesheets/xhtml5/edit/docbook.xsl
@@ -40,6 +40,21 @@
     </xsl:if>
   </xsl:template>
 
+  <xsl:template name="ezattribute_from_figure">
+      <xsl:if test="ancestor::ezxhtml5:figure/@*[starts-with(name(), 'data-ezattribute-')]">
+      <xsl:element name="ezattribute" namespace="http://docbook.org/ns/docbook">
+        <xsl:for-each select="ancestor::ezxhtml5:figure/@*[starts-with(name(), 'data-ezattribute-')]">
+          <xsl:element name="ezvalue" namespace="http://docbook.org/ns/docbook">
+            <xsl:attribute name="key">
+              <xsl:value-of select="substring-after(name(), 'data-ezattribute-')"/>
+            </xsl:attribute>
+            <xsl:value-of select="."/>
+          </xsl:element>
+        </xsl:for-each>
+      </xsl:element>
+    </xsl:if>
+  </xsl:template>
+
   <!-- Note: use only in context where literallayout is handled always in parent context -->
   <xsl:template name="breakline">
     <xsl:param name="node"/>
@@ -425,6 +440,13 @@
           <xsl:value-of select="@class"/>
         </xsl:attribute>
       </xsl:if>
+      <!-- Adding class and ezattribute from parent element (<figure>) -->
+      <xsl:if test="ancestor::ezxhtml5:figure/@class">
+        <xsl:attribute name="class">
+          <xsl:value-of select="../@class"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:call-template name="ezattribute_from_figure"/>
       <xsl:if test="contains( @style, 'width:' )">
         <xsl:variable name="width">
           <xsl:call-template name="extractStyleValue">
diff --git a/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/009-tableWithCustomClassesAndAttributes.docbook.xml b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/009-tableWithCustomClassesAndAttributes.docbook.xml
new file mode 100644
index 00000000..ecfd0d83
--- /dev/null
+++ b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/009-tableWithCustomClassesAndAttributes.docbook.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://docbook.org/ns/docbook" xmlns:ezcustom="http://ibexa.co/xmlns/dxp/docbook/custom" xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0-variant ezpublish-1.0">
+    <para ezxhtml:class="p-special">
+        <ezattribute>
+            <ezvalue key="p-custom-attribute">true</ezvalue>
+            <ezvalue key="p-another-attribute">attr2,attr1</ezvalue>
+        </ezattribute>sdf V8</para>
+    <informaltable class="table t-special">
+        <ezattribute>
+            <ezvalue key="t-custom-attribute">true</ezvalue>
+            <ezvalue key="t-another-attribute">attr2,attr1</ezvalue>
+        </ezattribute>
+        <tbody>
+            <tr>
+                <td> </td>
+                <td> </td>
+            </tr>
+            <tr>
+                <td> </td>
+                <td> </td>
+            </tr>
+            <tr>
+                <td> </td>
+                <td> </td>
+            </tr>
+            <tr>
+                <td> </td>
+                <td> </td>
+            </tr>
+        </tbody>
+    </informaltable>
+</section>
diff --git a/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/009-tableWithCustomClassesAndAttributes.xhtml5.edit.xml b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/009-tableWithCustomClassesAndAttributes.xhtml5.edit.xml
new file mode 100644
index 00000000..512c1cb5
--- /dev/null
+++ b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/009-tableWithCustomClassesAndAttributes.xhtml5.edit.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<section xmlns="http://ibexa.co/namespaces/ezpublish5/xhtml5/edit">
+    <p class="p-special" data-ezattribute-p-custom-attribute="true" data-ezattribute-p-another-attribute="attr2,attr1">sdf V8</p>
+    <figure class="table t-special" data-ezattribute-t-custom-attribute="true" data-ezattribute-t-another-attribute="attr2,attr1">
+        <table>
+            <tbody>
+                <tr>
+                    <td> </td>
+                    <td> </td>
+                </tr>
+                <tr>
+                    <td> </td>
+                    <td> </td>
+                </tr>
+                <tr>
+                    <td> </td>
+                    <td> </td>
+                </tr>
+                <tr>
+                    <td> </td>
+                    <td> </td>
+                </tr>
+            </tbody>
+        </table>
+    </figure>
+</section>
diff --git a/tests/lib/RichText/Validator/DocbookTest.php b/tests/lib/RichText/Validator/DocbookTest.php
index ae175623..0a86cc1c 100644
--- a/tests/lib/RichText/Validator/DocbookTest.php
+++ b/tests/lib/RichText/Validator/DocbookTest.php
@@ -111,6 +111,41 @@ public function providerForTestValidate()
             <emphasis role="strikedthrough">strikedthrough</emphasis>
         </subscript>
     </para>
+</section>',
+                [],
+            ],
+            [
+                '<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://docbook.org/ns/docbook" xmlns:ezcustom="http://ibexa.co/xmlns/dxp/docbook/custom" xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0-variant ezpublish-1.0">
+    <para ezxhtml:class="p-special">
+        <ezattribute>
+            <ezvalue key="p-custom-attribute">true</ezvalue>
+            <ezvalue key="p-another-attribute">attr2,attr1</ezvalue>
+        </ezattribute>sdf V8</para>
+    <informaltable class="p-special">
+        <ezattribute>
+            <ezvalue key="p-custom-attribute">true</ezvalue>
+            <ezvalue key="p-another-attribute">attr2,attr1</ezvalue>
+        </ezattribute>
+        <tbody>
+            <tr>
+                <td> </td>
+                <td> </td>
+            </tr>
+            <tr>
+                <td> </td>
+                <td> </td>
+            </tr>
+            <tr>
+                <td> </td>
+                <td> </td>
+            </tr>
+            <tr>
+                <td> </td>
+                <td> </td>
+            </tr>
+        </tbody>
+    </informaltable>
 </section>',
                 [],
             ],