diff --git a/src/core/gcal-recurrence.c b/src/core/gcal-recurrence.c
index 91a152c5..3d271036 100644
--- a/src/core/gcal-recurrence.c
+++ b/src/core/gcal-recurrence.c
@@ -229,6 +229,8 @@ gcal_recurrence_parse_recurrence_rules (ECalComponent *comp)
         {
           recur->limit_type = GCAL_RECURRENCE_UNTIL;
           recur->limit.until = gcal_date_time_from_icaltime (until);
+          if (!recur->limit.until)
+            recur->limit_type = GCAL_RECURRENCE_FOREVER;
         }
       else
         {