diff --git a/crates/caldav/src/calendar/resource.rs b/crates/caldav/src/calendar/resource.rs
index 1435a1c..11ceb6c 100644
--- a/crates/caldav/src/calendar/resource.rs
+++ b/crates/caldav/src/calendar/resource.rs
@@ -86,6 +86,7 @@ pub enum CalendarProp {
     Source(Option<HrefElement>),
 
     #[serde(other)]
+    #[strum_discriminants(strum(disabled))]
     #[default]
     Invalid,
 }
diff --git a/crates/caldav/src/calendar_object/resource.rs b/crates/caldav/src/calendar_object/resource.rs
index 99d33a4..b5cfc9f 100644
--- a/crates/caldav/src/calendar_object/resource.rs
+++ b/crates/caldav/src/calendar_object/resource.rs
@@ -36,6 +36,7 @@ pub enum CalendarObjectProp {
     CalendarData(String),
 
     #[serde(other)]
+    #[strum_discriminants(strum(disabled))]
     #[default]
     Invalid,
 }
diff --git a/crates/caldav/src/principal/mod.rs b/crates/caldav/src/principal/mod.rs
index fb21ead..9a906db 100644
--- a/crates/caldav/src/principal/mod.rs
+++ b/crates/caldav/src/principal/mod.rs
@@ -43,6 +43,7 @@ pub enum PrincipalProp {
     CalendarUserAddressSet(HrefElement),
 
     #[serde(other)]
+    #[strum_discriminants(strum(disabled))]
     #[default]
     Invalid,
 }
diff --git a/crates/carddav/src/address_object/resource.rs b/crates/carddav/src/address_object/resource.rs
index 05454db..136eff2 100644
--- a/crates/carddav/src/address_object/resource.rs
+++ b/crates/carddav/src/address_object/resource.rs
@@ -37,6 +37,7 @@ pub enum AddressObjectProp {
     AddressData(String),
 
     #[serde(other)]
+    #[strum_discriminants(strum(disabled))]
     #[default]
     Invalid,
 }
diff --git a/crates/carddav/src/addressbook/resource.rs b/crates/carddav/src/addressbook/resource.rs
index e4943e3..39b9ce7 100644
--- a/crates/carddav/src/addressbook/resource.rs
+++ b/crates/carddav/src/addressbook/resource.rs
@@ -1,5 +1,5 @@
 use super::methods::mkcol::route_mkcol;
-use super::methods::report::route_report_addressbook;
+// use super::methods::report::route_report_addressbook;
 use super::prop::{SupportedAddressData, SupportedReportSet};
 use crate::address_object::resource::AddressObjectResource;
 use crate::principal::PrincipalResource;
@@ -60,6 +60,7 @@ pub enum AddressbookProp {
     Getctag(String),
 
     #[serde(other)]
+    #[strum_discriminants(strum(disabled))]
     #[default]
     Invalid,
 }
@@ -241,8 +242,9 @@ impl<AS: AddressbookStore + ?Sized> ResourceService for AddressbookResourceServi
     #[inline]
     fn actix_additional_routes(res: actix_web::Resource) -> actix_web::Resource {
         let mkcol_method = web::method(Method::from_str("MKCOL").unwrap());
-        let report_method = web::method(Method::from_str("REPORT").unwrap());
+        // TODO: Re-enable REPORT
+        // let report_method = web::method(Method::from_str("REPORT").unwrap());
         res.route(mkcol_method.to(route_mkcol::<AS>))
-            .route(report_method.to(route_report_addressbook::<AS>))
+        // .route(report_method.to(route_report_addressbook::<AS>))
     }
 }
diff --git a/crates/carddav/src/principal/mod.rs b/crates/carddav/src/principal/mod.rs
index 0592de1..c9a8250 100644
--- a/crates/carddav/src/principal/mod.rs
+++ b/crates/carddav/src/principal/mod.rs
@@ -43,6 +43,7 @@ pub enum PrincipalProp {
     PrincipalAddress(Option<HrefElement>),
 
     #[serde(other)]
+    #[strum_discriminants(strum(disabled))]
     #[default]
     Invalid,
 }