diff --git a/docs/_includes/layouts/pages/basic.njk b/docs/_includes/layouts/pages/basic.njk
index 226fb84578..e1ddaa39dd 100755
--- a/docs/_includes/layouts/pages/basic.njk
+++ b/docs/_includes/layouts/pages/basic.njk
@@ -23,16 +23,14 @@ importElements:
 {% include 'partials/component/sidenav.njk' %}
 <main id="main">
 
-  <article {% if hasToc %}class="has-toc"{% endif %}>
+  <article {% if hasToc and (content | toc).length > 0 %}class="has-toc"{% endif %}>
 
   {% include 'partials/component/header.njk' %}
-  {% if hasToc %}
+  {% if hasToc and (content | toc).length > 0 %}
     <aside>
-      {% if (content | toc).length > 0 %} 
-        <uxdot-toc summary="On this page">
-          {{ content | toc | safe }}
-        </uxdot-toc>
-      {% endif %}
+      <uxdot-toc summary="On this page">
+        {{ content | toc | safe }}
+      </uxdot-toc>
     </aside>
   {% endif %}
 
diff --git a/docs/elements/elements.html b/docs/elements/elements.html
index 48a0791b69..683669fe45 100644
--- a/docs/elements/elements.html
+++ b/docs/elements/elements.html
@@ -53,7 +53,7 @@
 {% include 'partials/component/masthead.njk' %}
 {% include 'partials/component/sidenav.njk' %}
 <main id="main">
-  <article>
+  <article {% if hasToc and (content | toc).length > 0 %}class="has-toc"{% endif %}>
     <uxdot-header has-subnav>
       <h1 id="{{ doc.slug }}" class="page-title">{{ doc.alias or (doc.slug | deslugify) }}</h1>
       <rh-subnav slot="subnav">{% for tab in doc.tabs %}
@@ -63,7 +63,7 @@ <h1 id="{{ doc.slug }}" class="page-title">{{ doc.alias or (doc.slug | deslugify
       </rh-subnav>
     </uxdot-header>
 
-    {% if hasToc %}
+    {% if hasToc  and (content | toc).length > 0 %}
       <aside>
         {{ content | toc | safe }}
       </aside>