diff --git a/aircox_cms/sections.py b/aircox_cms/sections.py
index e5ae266..1298a58 100755
--- a/aircox_cms/sections.py
+++ b/aircox_cms/sections.py
@@ -1017,7 +1017,7 @@ class SectionTimetable(SectionItem,DatedListBase):
         context['object_list'] = self.get_queryset(context)
         context['target'] = self.target
         if not self.nav_visible:
-            context['nav_dates'] = None
+            del context['nav_dates']['dates'];
         return context
 
 
diff --git a/aircox_cms/templates/aircox_cms/snippets/date_list.html b/aircox_cms/templates/aircox_cms/snippets/date_list.html
index 1be873a..16061e2 100755
--- a/aircox_cms/templates/aircox_cms/snippets/date_list.html
+++ b/aircox_cms/templates/aircox_cms/snippets/date_list.html
@@ -2,7 +2,7 @@
 
 {# FIXME: get current complete URL #}
 <div class="list date_list">
-{% if nav_dates %}
+{% if nav_dates.dates %}
 <nav class="nav_dates">
     {% if target %}
     <a href="{{ target.url }}?date={{ nav_dates.today|date:"Y-m-d" }}" title="{% trans "go to today" %}">￮</a>