diff --git a/lib/models/calendar/CalendarDate.class.php b/lib/models/calendar/CalendarDate.class.php
index 167efd1ee47f7e9f5e1a559ee0725ac6cfc2e3ff..bb15ed823f83a8be910cb029ff0260894358ca45 100644
--- a/lib/models/calendar/CalendarDate.class.php
+++ b/lib/models/calendar/CalendarDate.class.php
@@ -818,7 +818,7 @@ class CalendarDate extends SimpleORMap implements PrivacyObject
             $repetition_dow_week = '1';
         } else {
 
-            if ($this->repetition_end) {
+            if ($this->repetition_end && intval($this->repetition_end) !== self::NEVER_ENDING) {
                 $repetition_end_date = htmlReady(date('d.m.Y', $this->repetition_end));
             } else {
                 //Provide a good default value in case the user wants to enable or change the repetition: