diff --git a/radicale/item/__init__.py b/radicale/item/__init__.py
index 975e4e7a..0b6ebd89 100644
--- a/radicale/item/__init__.py
+++ b/radicale/item/__init__.py
@@ -274,6 +274,9 @@ def check_and_sanitize_items(
                         raise ValueError("Unsupported FREQ in recurrence rule in %s in object %r: %r"
                                          % (component.name, component_uid, rrule._freq))
                     # RRULE has known FREQ+UNTIL+DTSTART
+                    # TZ code taken from vobject/icalendar.py/getrruleset
+                    if rrule._until.tzinfo is None:
+                        rrule._until = rrule._until.replace(tzinfo=dtstart.tzinfo)
                     if dtstart.tzinfo is not None:
                         rrule._until = rrule._until.astimezone(dtstart.tzinfo)
                     delta = rrule._until - dtstart