diff --git a/CHANGELOG b/CHANGELOG
index 487edfaf3..95881f06a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ mkdocs-material-0.2.1 (2016-03-12)
 
   * Fixed #10: Invisible header after closing search bar with ESC key
   * Fixed #13: Table cells don't wrap
+  * Fixed empty list in table of contents when no headline is defined
   * Corrected wrong path for static asset monitoring in Gulpfile.js
   * Set up tracking of site search for Google Analytics
 
diff --git a/material/nav.html b/material/nav.html
index d4641b8be..c926c085b 100644
--- a/material/nav.html
+++ b/material/nav.html
@@ -16,7 +16,7 @@
       {% if h1 %}
         {% set toc = (toc | first).children %}
       {% endif %}
-      {% if toc %}
+      {% if toc and (toc | first) %}
         <ul>
           {% for toc_item in toc %}
             <li class="anchor">
diff --git a/src/nav.html b/src/nav.html
index 1262d3446..1d70b9fc1 100644
--- a/src/nav.html
+++ b/src/nav.html
@@ -33,7 +33,7 @@
       {% endif %}
 
       <!-- Render anchors of active page -->
-      {% if toc %}
+      {% if toc and (toc | first) %}
         <ul>
           {% for toc_item in toc %}