diff --git a/templates/components/fieldset/layout.html.twig b/templates/components/fieldset/layout.html.twig
index d6346530f..c3a0d4a22 100644
--- a/templates/components/fieldset/layout.html.twig
+++ b/templates/components/fieldset/layout.html.twig
@@ -1,7 +1,9 @@
+{% if oUIBlock.GetSubBlocks() %}
 <fieldset class="ibo-fieldset">
     <legend class="ibo-fieldset-legend">{{ oUIBlock.GetLegend() }}</legend>
     <hr class="ibo-fieldset-legend-separator">
     {% for oSubBlock in oUIBlock.GetSubBlocks() %}
         {{ render_block(oSubBlock, {aPage: aPage}) }}
     {% endfor %}
-</fieldset>
\ No newline at end of file
+</fieldset>
+{% endif %}
\ No newline at end of file