diff --git a/lib/Server/Server.php b/lib/Server/Server.php
index 09ee242..dcb69d0 100644
--- a/lib/Server/Server.php
+++ b/lib/Server/Server.php
@@ -114,6 +114,7 @@ protected function initialize() {
         $this->initializeAuthentication();
         $this->initializePrincipals($principalBackend);
         $this->initializeCardDAV($principalBackend);
+        $this->initializePropertyStorage();
         $this->initializeCalDAV($principalBackend);
         $this->initializeScheduling();
         $this->initializeWebDAV($principalBackend);
@@ -207,6 +208,17 @@ protected function initializeCardDAV(DavAcl\Principal\Backend $principalBackend)
         $this->getServer()->addPlugin(new SabreCardDav\VCFExportPlugin());
     }
 
+    /**
+     * Initialize PropertyStorage
+     *
+     * @return void
+     */
+    protected function initializePropertyStorage()
+    {
+        $backend = new SabreDav\PropertyStorage\Backend\PDO($this->getDatabase());
+        $this->getServer()->addPlugin(new SabreDav\PropertyStorage\Plugin($backend));
+    }
+
     /**
      * Initialize CalDAV.
      *