diff --git a/changelog/63_UNRELEASED_xxxx.xx.xx.md b/changelog/63_UNRELEASED_xxxx.xx.xx.md
new file mode 100644
index 00000000..c81eb25a
--- /dev/null
+++ b/changelog/63_UNRELEASED_xxxx.xx.xx.md
@@ -0,0 +1,2 @@
+- Fixed that the upgrade failed when having "> 2 times duplicate" (means the same barcode was added more than 2 times) product barcodes
+- Fixed that when having any "Track date only" chore on the calendar, the iCal export was broken
diff --git a/controllers/CalendarApiController.php b/controllers/CalendarApiController.php
index 3c48d732..609913ba 100644
--- a/controllers/CalendarApiController.php
+++ b/controllers/CalendarApiController.php
@@ -30,7 +30,7 @@ class CalendarApiController extends BaseApiController
 				if ($event['date_format'] === 'date' || (isset($event['allDay']) && $event['allDay']))
 				{
 					// All-day event
-					$date = new Date(\DateTimeImmutable::createFromFormat('Y-m-d', $event['start']));
+					$date = new Date(\DateTimeImmutable::createFromFormat('Y-m-d', substr($event['start'], 0, 10)));
 					$vEventOccurrence = new SingleDay($date);
 				}
 				else