diff --git a/templates/partials/sidebar_right.html.twig b/templates/partials/sidebar_right.html.twig
index 1aee812..091e28e 100755
--- a/templates/partials/sidebar_right.html.twig
+++ b/templates/partials/sidebar_right.html.twig
@@ -38,13 +38,16 @@
{% endif %}
{% if config.plugins.taxonomylist.enabled %}
-
-
-
- {{ 'FUTURE.SIDEBAR.TAGS.HEADLINE'|t }}
-
- {% include 'partials/taxonomylist.html.twig' with {'base_url':new_base_url, 'taxonomy':'tag'} %}
-
+ {% set taxlist = children_only is defined ? taxonomylist.getChildPagesTags() : taxonomylist.get() %}
+ {% if taxlist %}
+
+
+
+ {{ 'FUTURE.SIDEBAR.TAGS.HEADLINE'|t }}
+
+ {% include 'partials/taxonomylist.html.twig' with {'base_url':new_base_url, 'taxonomy':'tag'} %}
+
+ {% endif %}
{% endif %}
{% if config.plugins.feed.enabled %}
diff --git a/templates/partials/taxonomylist.html.twig b/templates/partials/taxonomylist.html.twig
index 433dcab..18aace5 100644
--- a/templates/partials/taxonomylist.html.twig
+++ b/templates/partials/taxonomylist.html.twig
@@ -1,12 +1,10 @@
-{% set taxlist = children_only is defined ? taxonomylist.getChildPagesTags() : taxonomylist.get() %}
-
-{% if taxlist %}
-{% endif %}