diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index b6ae9990cc2..d70d51fe5be 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -449,7 +449,8 @@ class MailComposer(models.TransientModel):
 
             results[res_id] = mail_values
 
-        results = self._process_state(results)
+        if mass_mail_mode:
+            results = self._process_state(results)
         return results
 
     def _process_recipient_values(self, mail_values_dict):