diff --git a/data/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt b/data/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt
index eae2070f..15de68e9 100644
--- a/data/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt
+++ b/data/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt
@@ -125,9 +125,9 @@ class PluginCalendarEventDeserializer(
                 PluginCalendarEvent(
                     id = id,
                     color = json.color,
-                    startTime = json.startTime ?: 0,
-                    endTime = json.endTime ?: 0,
-                    allDay = json.allDay ?: false,
+                    startTime = json.startTime,
+                    endTime = json.endTime ?: return null,
+                    allDay = json.allDay == true,
                     description = json.description,
                     calendarName = json.calendarName,
                     location = json.location,