diff --git a/inc/caldav-PROPFIND.php b/inc/caldav-PROPFIND.php
index 49a8c393..eb27d1c9 100644
--- a/inc/caldav-PROPFIND.php
+++ b/inc/caldav-PROPFIND.php
@@ -427,8 +427,6 @@ function item_to_xml( $item ) {
 
   $allprop = isset($prop_list['DAV::allprop']);
 
-  $item->properties = get_arbitrary_properties($item->dav_name);
-
   $url = ConstructURL($item->dav_name);
 
   $prop = new XMLElement("prop");
@@ -464,6 +462,8 @@ function item_to_xml( $item ) {
   */
   add_general_properties( $prop, $not_found, $denied, $item );
 
+  add_arbitrary_properties($prop, $not_found, $item );
+
   return build_propstat_response( $prop, $not_found, $denied, $url );
 }