diff --git a/src/dev/peerat/backend/routes/ChapterList.java b/src/dev/peerat/backend/routes/ChapterList.java
index 8a5ede1..22ae771 100644
--- a/src/dev/peerat/backend/routes/ChapterList.java
+++ b/src/dev/peerat/backend/routes/ChapterList.java
@@ -35,8 +35,8 @@ public class ChapterList implements Response {
 				chapterJSON.set("id", chapter.getId());
 				chapterJSON.set("name", chapter.getName());
 				chapterJSON.set("show", chapter.hasStarted());
-				chapterJSON.set("start", chapter.getStartDate().toString());
-				chapterJSON.set("end", chapter.getEndDate().toString());
+				if(chapter.getStartDate() != null) chapterJSON.set("start", chapter.getStartDate().toString());
+				if(chapter.getEndDate() != null) chapterJSON.set("end", chapter.getEndDate().toString());
 				chaptersJSON.add(chapterJSON);
 			}
 			context.response(200);