diff --git a/tpl/gallery.html b/tpl/gallery.html
index f4df131..1d05128 100644
--- a/tpl/gallery.html
+++ b/tpl/gallery.html
@@ -16,6 +16,7 @@
     </div>
   </div>
   <div class="content">
+  {% if(!empty($dirs)): %}
   {% foreach($dirs as $d): %}
     <div class="multi-image">
       <a href="index.php?d={{ $dir }}/{{ $d }}&s={{ $slice }}&p=1">
@@ -24,6 +25,8 @@
       <p class="dirname">{{ $d }}</p>
     </div>      
   {% endforeach %}
+  {% endif %}
+  {% if(!empty($images)): %}
   {% foreach($images as $image): %}
     <div class="multi-image">
       <a href="index.php?d={{ $dir }}&s=1&gs={{ $slice }}&p={{ $image['i'] }}{{ $filter }}">
@@ -31,6 +34,7 @@
       </a>
     </div>
   {% endforeach %}
+  {% endif %}
   </div>
   <div class="page-footer">
     <a id="link-first" href="/index.php?d={{ $dir }}&p=1&s={{ $slice }}{{ $filter }}">1</a>
diff --git a/tpl/single.html b/tpl/single.html
index 633ff69..929a508 100644
--- a/tpl/single.html
+++ b/tpl/single.html
@@ -20,9 +20,11 @@
     </a>
   </div>
   <div class="page-footer">
+    {% if(!empty($tags)): %}
     {% foreach($tags as $tag): %}
     <a href="/index.php?d={{ $dir }}&s={{ $gallery_slice }}&f={{{ $tag }}}"><span class="tag">{{ $tag }}</span></a>
     {% endforeach %}
+    {% endif %}
   </div>
 </div>
 {% endblock %}