diff --git a/crates/caldav/src/calendar/methods/report/calendar_multiget.rs b/crates/caldav/src/calendar/methods/report/calendar_multiget.rs
index 166ec21..6df1bf1 100644
--- a/crates/caldav/src/calendar/methods/report/calendar_multiget.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_multiget.rs
@@ -75,12 +75,9 @@ pub async fn handle_calendar_multiget<C: CalendarStore>(
         }
         PropfindType::Prop(PropElement(prop_tags)) => prop_tags
             .into_iter()
-            .filter_map(|propname| {
-                if let ReportPropName::Propname(propname) = propname {
-                    Some(propname.0)
-                } else {
-                    None
-                }
+            .map(|propname| match propname {
+                ReportPropName::Propname(propname) => propname.0,
+                ReportPropName::CalendarData(_) => "calendar-data".to_owned(),
             })
             .collect(),
     };
diff --git a/crates/caldav/src/calendar/methods/report/calendar_query.rs b/crates/caldav/src/calendar/methods/report/calendar_query.rs
index bda8471..4d0115e 100644
--- a/crates/caldav/src/calendar/methods/report/calendar_query.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query.rs
@@ -234,12 +234,9 @@ pub async fn handle_calendar_query<C: CalendarStore>(
         }
         PropfindType::Prop(PropElement(prop_tags)) => prop_tags
             .into_iter()
-            .filter_map(|propname| {
-                if let ReportPropName::Propname(propname) = propname {
-                    Some(propname.0)
-                } else {
-                    None
-                }
+            .map(|propname| match propname {
+                ReportPropName::Propname(propname) => propname.0,
+                ReportPropName::CalendarData(_) => "calendar-data".to_owned(),
             })
             .collect(),
     };
diff --git a/crates/caldav/src/calendar/methods/report/sync_collection.rs b/crates/caldav/src/calendar/methods/report/sync_collection.rs
index 3ffc03a..9248992 100644
--- a/crates/caldav/src/calendar/methods/report/sync_collection.rs
+++ b/crates/caldav/src/calendar/methods/report/sync_collection.rs
@@ -34,12 +34,9 @@ pub async fn handle_sync_collection<C: CalendarStore>(
         }
         PropfindType::Prop(PropElement(prop_tags)) => prop_tags
             .into_iter()
-            .filter_map(|propname| {
-                if let ReportPropName::Propname(propname) = propname {
-                    Some(propname.0)
-                } else {
-                    None
-                }
+            .map(|propname| match propname {
+                ReportPropName::Propname(propname) => propname.0,
+                ReportPropName::CalendarData(_) => "calendar-data".to_owned(),
             })
             .collect(),
     };