diff --git a/index.php b/index.php
index e7268cb1f..0eb33a860 100644
--- a/index.php
+++ b/index.php
@@ -201,6 +201,7 @@ if ( empty($page['is_external']) )
 
     if (isset($my_search['fields']['tags']))
     {
+      $filter_tags = $filter_tag_ids = array();
       // TODO calling get_available_tags(), with lots of photos/albums/tags may cost time,
       // we should reuse the result if already executed (for building the menu for example)
       if (isset($search_items))
@@ -213,18 +214,16 @@ if ( empty($page['is_external']) )
         usort($filter_tags, 'tag_alpha_compare');
       }
 
-      $filter_tag_ids = array();
-
       if (count($filter_tags) > 0)
       {
-        $template->assign('TAGS', $filter_tags);
-
         foreach ($filter_tags as $tag)
         {
           $filter_tag_ids[] = $tag['id'];
         }
       }
 
+      $template->assign('TAGS', $filter_tags);
+
       // in case the search has forbidden tags for current user, we need to filter the search rule
       $my_search['fields']['tags']['words'] = array_intersect($my_search['fields']['tags']['words'], $filter_tag_ids);
     }
diff --git a/themes/default/template/include/search_filters.inc.tpl b/themes/default/template/include/search_filters.inc.tpl
index d2131558b..18f5636c6 100644
--- a/themes/default/template/include/search_filters.inc.tpl
+++ b/themes/default/template/include/search_filters.inc.tpl
@@ -133,6 +133,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
       </div>
       </div>
     </div>
+{if isset($TAGS)}
   <div class="filter filter-tag">
     <span class="mcs-icon pwg-icon-tag filter-icon"></span>
     <span class="search-words"></span>
@@ -167,6 +168,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
       </div>
     </div>
   </div>
+{/if}
 
   {if isset($DATE_POSTED)}
   <div class="filter filter-date_posted">