diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php
index ecd8d37f8f..743e53e5ce 100644
--- a/mail/inc/class.mail_sieve.inc.php
+++ b/mail/inc/class.mail_sieve.inc.php
@@ -238,7 +238,6 @@ class mail_sieve
 
 				$rules = $this->rulesByID;
 				$content= $rules;
-				$content['no_forward'] = $this->account->acc_smtp_type !== Api\Mail\Smtp::class && !$this->account->acc_user_forward;
 				$content ['ruleID'] = $_GET['ruleID'];
 				switch ($rules['action'])
 				{
@@ -395,6 +394,9 @@ class mail_sieve
 
 		);
 
+		// No forward should be applied regardless of content/rules
+		$content['no_forward'] = $this->account->acc_smtp_type !== Api\Mail\Smtp::class && !$this->account->acc_user_forward;
+
 		//Set the preselect_options for mail/folders as we are not allow free entry for folder taglist
 		$sel_options['action_folder_text'] = $this->ajax_getFolders(0,true,null,true);