diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php
index a5c87c9679a36eb1f3ecd200c3e889ec0f2ba008..0a71a9302cc1a03daa09e19b2ce2ddaddc5804a6 100644
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -339,7 +339,7 @@ class MailTemplateService {
 			}
 		}
 
-		if ($subject === '' || $subject === NULL) {
+		if ($this->subject !== '' && $this->subject !== NULL) {
 			$subject = $this->subject;
 		}