diff --git a/server.py b/server.py
index 71289fbc217c6cc61eaf853d5b850bdcb8c502ee..3d6a5407da9956ec452054bb2255d92b3f3ea449 100644
--- a/server.py
+++ b/server.py
@@ -579,6 +579,8 @@ def suggest_chapter(lectureid):
 @app.route('/chapters/<int:lectureid>')
 def chapters(lectureid):
 	chapters = query("SELECT * FROM chapters WHERE lecture_id = ? and visible ORDER BY time DESC", lectureid)
+	if not chapters:
+		return 'No chapters found', 404
 	last = None
 	for c in chapters:
 		c['start'] = c['time']