diff --git a/lib/CardDAV/Plugin.php b/lib/CardDAV/Plugin.php
index 09d1f593da..0a87ef47c9 100644
--- a/lib/CardDAV/Plugin.php
+++ b/lib/CardDAV/Plugin.php
@@ -242,7 +242,8 @@ public function addressbookMultiGetReport($report)
             if (isset($props['200']['{'.self::NS_CARDDAV.'}address-data'])) {
                 $props['200']['{'.self::NS_CARDDAV.'}address-data'] = $this->convertVCard(
                     $props[200]['{'.self::NS_CARDDAV.'}address-data'],
-                    $vcardType
+                    $vcardType,
+                    $report->addressDataProperties
                 );
             }
             $propertyList[] = $props;
diff --git a/lib/DAV/Xml/Element/Response.php b/lib/DAV/Xml/Element/Response.php
index 45c161fa4f..5a4834e230 100644
--- a/lib/DAV/Xml/Element/Response.php
+++ b/lib/DAV/Xml/Element/Response.php
@@ -112,13 +112,14 @@ public function getResponseProperties()
      */
     public function xmlSerialize(Writer $writer)
     {
+        $empty = true;
+
         if ($status = $this->getHTTPStatus()) {
+            $empty = false;
             $writer->writeElement('{DAV:}status', 'HTTP/1.1 '.$status.' '.\Sabre\HTTP\Response::$statusCodes[$status]);
         }
         $writer->writeElement('{DAV:}href', $writer->contextUri.\Sabre\HTTP\encodePath($this->getHref()));
 
-        $empty = true;
-
         foreach ($this->getResponseProperties() as $status => $properties) {
             // Skipping empty lists
             if (!$properties || (!ctype_digit($status) && !is_int($status))) {
diff --git a/tests/Sabre/CardDAV/MultiGetTest.php b/tests/Sabre/CardDAV/MultiGetTest.php
index ac0cd5e910..b078b1e6ab 100644
--- a/tests/Sabre/CardDAV/MultiGetTest.php
+++ b/tests/Sabre/CardDAV/MultiGetTest.php
@@ -96,4 +96,50 @@ public function testMultiGetVCard4()
             ],
         ], $result);
     }
+
+    public function testMultiGetAddressObjectProperties()
+    {
+        $request = HTTP\Sapi::createFromServerArray([
+            'REQUEST_METHOD' => 'REPORT',
+            'REQUEST_URI' => '/addressbooks/user1/book3',
+        ]);
+
+        $request->setBody(
+'<?xml version="1.0"?>
+<c:addressbook-multiget xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:carddav">
+    <d:prop>
+      <d:getetag />
+      <c:address-data>
+          <c:prop name="FN"/>
+          <c:prop name="BDAY"/>
+      </c:address-data>
+    </d:prop>
+    <d:href>/addressbooks/user1/book3/card3</d:href>
+</c:addressbook-multiget>'
+            );
+
+        $response = new HTTP\ResponseMock();
+
+        $this->server->httpRequest = $request;
+        $this->server->httpResponse = $response;
+
+        $this->server->exec();
+
+        $bodyAsString = $response->getBodyAsString();
+        $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:'.$bodyAsString);
+
+        // using the client for parsing
+        $client = new DAV\Client(['baseUri' => '/']);
+
+        $result = $client->parseMultiStatus($bodyAsString);
+
+        $this->assertEquals([
+            '/addressbooks/user1/book3/card3' => [
+                200 => [
+                    '{DAV:}getetag' => '"'.md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nFN:Test-Card\nEMAIL;TYPE=home:bar@example.org\nEND:VCARD").'"',
+                    '{urn:ietf:params:xml:ns:carddav}address-data' => "BEGIN:VCARD\r\nVERSION:3.0\r\nUID:12345\r\nFN:Test-Card\r\nEND:VCARD\r\n",
+                ],
+            ],
+        ], $result);
+    }
 }
diff --git a/tests/Sabre/DAVACL/PrincipalMatchTest.php b/tests/Sabre/DAVACL/PrincipalMatchTest.php
index 0746d2e50e..7862f2c59d 100644
--- a/tests/Sabre/DAVACL/PrincipalMatchTest.php
+++ b/tests/Sabre/DAVACL/PrincipalMatchTest.php
@@ -30,10 +30,6 @@ public function testPrincipalMatch()
 <d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
     <d:status>HTTP/1.1 200 OK</d:status>
     <d:href>/principals/user1</d:href>
-    <d:propstat>
-        <d:prop/>
-        <d:status>HTTP/1.1 418 I'm a teapot</d:status>
-    </d:propstat>
 </d:multistatus>
 XML;