diff --git a/app/components/nav/sidebar.hbs b/app/components/nav/sidebar.hbs
index 7af7a15f299a02ad92629bad1cdd9f64aaef6d52..2c1eaa6fba0867b8f3f55edaa9a5ca8c434725de 100644
--- a/app/components/nav/sidebar.hbs
+++ b/app/components/nav/sidebar.hbs
@@ -21,23 +21,25 @@
             <i class="fa fa-home me-2"></i>Home
           </LinkTo>
         </li>
-        <li>
-          <button class="btn btn-toggle rounded align-items-center text-white" data-bs-toggle="collapse" data-bs-target="#home-collapse" aria-expanded="false">
-            Pinned tags
-          </button>
-          <div id="home-collapse" class="collapse">
-            <ul class="list-unstyled px-3 mx-3 my-1">
-            {{#each @pinned_tags as |pinned_tag|}}
-              <li class="mb-2 pb-1">
-                  <Tag::Item
-                      @name={{pinned_tag.name}}
-                      @fg_color={{pinned_tag.fg_color}}
-                      @bg_color={{pinned_tag.bg_color}} />
-              </li>
-            {{/each}}
-            </ul>
-          </div>
-        </li>
+        {{#if this.show_pinned_tags}}
+          <li>
+            <button class="btn btn-toggle rounded align-items-center text-white" data-bs-toggle="collapse" data-bs-target="#home-collapse" aria-expanded="false">
+              Pinned Tags
+            </button>
+            <div id="home-collapse" class="collapse">
+              <ul class="list-unstyled px-3 mx-3 my-1">
+              {{#each @pinned_tags as |pinned_tag|}}
+                <li class="mb-2 pb-1">
+                    <Tag::Item
+                        @name={{pinned_tag.name}}
+                        @fg_color={{pinned_tag.fg_color}}
+                        @bg_color={{pinned_tag.bg_color}} />
+                </li>
+              {{/each}}
+              </ul>
+            </div>
+          </li>
+        {{/if}}
         <li>
           <LinkTo
             @route="authenticated.nodes"
diff --git a/app/components/nav/sidebar.js b/app/components/nav/sidebar.js
index ec91ffe41b6425e383ca405f6ea40819eb8c2830..bfc5247cc97bb174ac5af61aae3987b654e1accf 100644
--- a/app/components/nav/sidebar.js
+++ b/app/components/nav/sidebar.js
@@ -10,4 +10,14 @@ export default class SidebarComponent extends Component {
       return tags.filter(tag => tag.pinned);
     });
   }
+
+  get show_pinned_tags() {
+    if (this.args.pinned_tags) {
+      if (this.args.pinned_tags.length > 0) {
+        return true;
+      }
+    }
+
+    return false;
+  }
 }