diff --git a/_includes/panel.html b/_includes/panel.html
index d6ae271cdb5..c09823a7b3a 100644
--- a/_includes/panel.html
+++ b/_includes/panel.html
@@ -45,18 +45,22 @@ <h3 data-toc-skip>
 
   {% endif %} <!-- site.data.updates -->
 
+  {% include trending_tags.html %}
+
+  {% if trending_tags.size > 0 %}
     <div id="access-tags">
       <h3 data-toc-skip>
         {{- site.data.label.panel.trending_tags -}}
       </h3>
       <div class="d-flex flex-wrap mt-3 mb-1 mr-3">
-      {% include trending-tags.html %}
+
       {% for tag in trending_tags %}
         {% capture url %}/tags/{{ tag | downcase | url_encode }}/{% endcapture %}
         <a class="post-tag" href="{{ url | relative_url }}">{{ tag | replace: '-', ' ' }}</a>
        {% endfor %}
       </div>
     </div>
+  {% endif %}
 
   </div> <!-- .access -->
 
diff --git a/_includes/search-results.html b/_includes/search-results.html
index a11832db77c..519de3f8d60 100644
--- a/_includes/search-results.html
+++ b/_includes/search-results.html
@@ -9,7 +9,7 @@
   <div class="col-12 col-xl-11 post-content">
     <div id="search-hints">
       <h4 class="text-muted mb-4">{{ site.data.label.panel.trending_tags }}</h4>
-      {% include trending-tags.html %}
+      {% include trending_tags.html %}
       {% for tag in trending_tags %}
         {% capture url %}/tags/{{ tag | downcase | url_encode }}/{% endcapture %}
         <a class="post-tag" href="{{ url | relative_url }}">{{ tag | replace: '-', ' ' }}</a>
diff --git a/_includes/trending-tags.html b/_includes/trending_tags.html
similarity index 100%
rename from _includes/trending-tags.html
rename to _includes/trending_tags.html
diff --git a/assets/js/data/cache-list.js b/assets/js/data/cache-list.js
index 418ae12b27d..3dd3d005702 100644
--- a/assets/js/data/cache-list.js
+++ b/assets/js/data/cache-list.js
@@ -65,7 +65,7 @@ const include = [
   {% endfor %}
 
   /* Trending tags */
-  {% include trending-tags.html %}
+  {% include trending_tags.html %}
   {% for tag in trending_tags %}
     {% capture tag_url %}/tags/{{ tag | downcase | url_encode }}/{% endcapture %}
     '{{ tag_url | relative_url }}',