diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index f5ffd278c..3be263b47 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -95,7 +95,6 @@ class SnappyMailHelper
 		if ($handle) {
 			\header_remove('Content-Security-Policy');
 			\RainLoop\Service::Handle();
-			exit;
 		}
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index a71766f79..60a6e28c0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -10,7 +10,7 @@ abstract class Service
 	public static function Handle() : bool
 	{
 		static $bOne = null;
-		if (null === $bOne) {
+		if (null === $bOne && false === \stripos(\php_sapi_name(), 'cli')) {
 			$bOne = static::RunResult();
 		}