diff --git a/integrations/nextcloud/snappymail/lib/Controller/PageController.php b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
index bbde8cda6..b78af3b38 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/PageController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
@@ -47,8 +47,7 @@ class PageController extends Controller
 	 */
 	public function appGet()
 	{
-		SnappyMailHelper::startApp();
-		\RainLoop\Service::Handle();
+		SnappyMailHelper::startApp(true);
 		exit;
 	}
 
diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index e868f50d8..c561dc8ef 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -58,6 +58,7 @@ class SnappyMailHelper
 		}
 
 		if ($handle) {
+			\header_remove('Content-Security-Policy');
 			\RainLoop\Service::Handle();
 			exit;
 		}