diff --git a/apps/dav/lib/caldav/caldavbackend.php b/apps/dav/lib/caldav/caldavbackend.php
index 4dcd1bed3d..19bbc6cb93 100644
--- a/apps/dav/lib/caldav/caldavbackend.php
+++ b/apps/dav/lib/caldav/caldavbackend.php
@@ -212,6 +212,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 						'uri' => $query->createNamedParameter($values['uri']),
 						'synctoken' => $query->createNamedParameter($values['synctoken']),
 						'transparent' => $query->createNamedParameter($values['transparent']),
+						'components' => $query->createNamedParameter($values['components']),
 				])
 				->execute();
 	}
diff --git a/apps/dav/tests/unit/caldav/caldavbackendtest.php b/apps/dav/tests/unit/caldav/caldavbackendtest.php
index 5e3d4288aa..fdd76f9021 100644
--- a/apps/dav/tests/unit/caldav/caldavbackendtest.php
+++ b/apps/dav/tests/unit/caldav/caldavbackendtest.php
@@ -23,6 +23,7 @@ namespace Tests\Connector\Sabre;
 use DateTime;
 use DateTimeZone;
 use OCA\DAV\CalDAV\CalDavBackend;
+use Sabre\CalDAV\Property\SupportedCalendarComponentSet;
 use Sabre\DAV\Property\Href;
 use Sabre\DAV\PropPatch;
 use Test\TestCase;
@@ -252,6 +253,9 @@ EOD;
 		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
 		$this->assertEquals(1, count($calendars));
 		$this->assertEquals(self::UNIT_TEST_USER, $calendars[0]['principaluri']);
+		/** @var SupportedCalendarComponentSet $components */
+		$components = $calendars[0]['{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set'];
+		$this->assertEquals(['VEVENT','VTODO'], $components->getValue());
 		$this->assertEquals('Example', $calendars[0]['uri']);
 		$calendarId = $calendars[0]['id'];