2 files changed, 5 insertions, 3 deletions

diff --git a/framework/src/domain/daylongeventmodel.cpp b/framework/src/domain/daylongeventmodel.cpp
index 1b47edda..2b288ff5 100644
--- a/framework/src/domain/daylongeventmodel.cpp
+++ b/framework/src/domain/daylongeventmodel.cpp
@@ -81,7 +81,10 @@ QVariant DayLongEventModel::data(const QModelIndex &idx, int role) const
             return dayIndex;
         }
         case Duration:
-            return event->getStartTime().date().daysTo(event->getEndTime().date());
+            if (!event->getEndTime().isValid()) {
+                return 1;
+            }
+            return qMax(event->getStartTime().date().daysTo(event->getEndTime().date()), 1ll);
         case Color:
             return getColor(event->getCalendar());
     }
diff --git a/views/calendar/main.qml b/views/calendar/main.qml
index 1e7e8eac..d27817f5 100644
--- a/views/calendar/main.qml
+++ b/views/calendar/main.qml
@@ -100,8 +100,7 @@ ApplicationWindow {
                         resource: "caldavresource",
                         summary: "Test day-long event2",
                         description: "This is test day-long event #2",
-                        starts: "2018-04-11T00:00:00",
-                        ends:   "2018-04-23T00:00:00",
+                        starts: "2018-04-11",
                         allDay: true,
                     },
                     {