diff --git a/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_parent_additional_fields.py.jinja2 b/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_parent_additional_fields.py.jinja2
index 6f1b52f..96aaa49 100644
--- a/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_parent_additional_fields.py.jinja2
+++ b/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_parent_additional_fields.py.jinja2
@@ -1,4 +1,4 @@
-{% if "additional-fields" in vars %}
+{% if "additional-fields" in vars and vars.additional_fields | length > 0 %}
 {% for field in vars.additional_fields.values() %}
 {{ field|code_imports }}
 {% endfor %}
diff --git a/setup.cfg b/setup.cfg
index e0e6828..3754f86 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-model-builder-drafts
-version = 4.0.36
+version = 4.0.37
 description =
 authors = Ronald Krist <krist@cesnet.cz>
 readme = README.md