diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index aba71eaa7..36e3b6555 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -55,6 +55,7 @@ use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IServerContainer;
 use OCP\IUser;
 use OCP\Security\CSP\AddContentSecurityPolicyEvent;
+use OCP\Security\FeaturePolicy\AddFeaturePolicyEvent;
 use OCP\Settings\IManager;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
@@ -119,6 +120,7 @@ class Application extends App {
 		/** @var IEventDispatcher $newDispatcher */
 		$newDispatcher = $server->query(IEventDispatcher::class);
 		$newDispatcher->addServiceListener(AddContentSecurityPolicyEvent::class, Listener\CSPListener::class);
+		$newDispatcher->addServiceListener(AddFeaturePolicyEvent::class, Listener\FeaturePolicyListener::class);
 
 		$this->registerNavigationLink($server);
 		$this->registerRoomActivityHooks($dispatcher);
diff --git a/lib/Listener/FeaturePolicyListener.php b/lib/Listener/FeaturePolicyListener.php
new file mode 100644
index 000000000..50e7c4f45
--- /dev/null
+++ b/lib/Listener/FeaturePolicyListener.php
@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Spreed\Listener;
+
+use OCP\AppFramework\Http\FeaturePolicy;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Security\FeaturePolicy\AddFeaturePolicyEvent;
+
+class FeaturePolicyListener implements IEventListener {
+
+	public function handle(Event $event): void {
+		if (!($event instanceof AddFeaturePolicyEvent)) {
+			return;
+		}
+
+		$policy = new FeaturePolicy();
+		$policy->addAllowedCameraDomain('\'self\'');
+		$policy->addAllowedMicrophoneDomain('\'self\'');
+		$event->addPolicy($policy);
+	}
+
+}