diff --git a/app/models/message_template/issue_changed.rb b/app/models/message_template/issue_changed.rb
index 7edc8f05d..90a72d1a0 100644
--- a/app/models/message_template/issue_changed.rb
+++ b/app/models/message_template/issue_changed.rb
@@ -188,6 +188,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
   end
 
   def self.get_email_message_content(receiver, operator, issue, change_params)
+    return '', '', '' if change_params.blank?
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::IssueChanged"]
     end
diff --git a/app/models/message_template/pull_request_changed.rb b/app/models/message_template/pull_request_changed.rb
index 729e12060..fc4457f37 100644
--- a/app/models/message_template/pull_request_changed.rb
+++ b/app/models/message_template/pull_request_changed.rb
@@ -100,6 +100,7 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
   end
 
   def self.get_email_message_content(receiver, operator, pull_request, change_params)
+    return '', '', '' if change_params.blank?
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::PullRequestChanged"]
     end