diff --git a/templates/index.html b/templates/index.html
index 530c8d7..ff5f1f9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,8 +13,13 @@
         {{ range . }}
         <tr class="pointer" onclick="window.location='/watch/view/{{ .ID }}'">
             <td class="h3">{{ .Name }}</td>
-            <td class="h3">{{ .CronEntry.Prev.Format "2006-01-02 15:04:05" }}</td>
-            <td class="h3">{{ .CronEntry.Next.Format "2006-01-02 15:04:05" }}</td>
+            {{ if .CronEntry }}
+                <td class="h3">{{ .CronEntry.Prev.Format "2006-01-02 15:04:05" }}</td>
+                <td class="h3">{{ .CronEntry.Next.Format "2006-01-02 15:04:05" }}</td>
+
+            {{ else }}
+                <td class="h3" colspan="2">No schedule (Add cron filter)</td>
+            {{ end }}
             <td>
                 <a href="/watch/edit/{{ .ID }}" class="btn btn-success">Edit</a>
             </td>
diff --git a/todo.md b/todo.md
index e018fea..f9d1b07 100644
--- a/todo.md
+++ b/todo.md
@@ -3,5 +3,4 @@
 - condition filters have var1 pointing to other filter?
 - header/post body for get url ?
 - add toast when editing to replace notify ?
-- unescape notify string
-- fix bug when no cron job for watch
\ No newline at end of file
+- unescape notify string
\ No newline at end of file