diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 916ca002872..19a345a9e47 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -75,7 +75,8 @@ class MailComposeMessage(models.TransientModel):
                     'model': self.model,
                     'res_id': res_id,
                     'mass_mailing_id': mass_mailing.id,
-                    'email': mail_to,
+                    # if mail_to is void, keep falsy values to allow searching / debugging traces
+                    'email': mail_to or mail_values.get('email_to'),
                 }
                 if mail_values.get('body_html') and mass_mail_layout:
                     mail_values['body_html'] = mass_mail_layout._render({'body': mail_values['body_html']}, engine='ir.qweb', minimal_qcontext=True)
diff --git a/addons/test_mail_full/tests/test_mass_mailing.py b/addons/test_mail_full/tests/test_mass_mailing.py
index 9693631ec8a..135c0e0f751 100644
--- a/addons/test_mail_full/tests/test_mass_mailing.py
+++ b/addons/test_mail_full/tests/test_mass_mailing.py
@@ -63,11 +63,8 @@ class TestMassMailing(TestMailFullCommon):
                 recipient_info['state'] = 'ignored'
             # falsy: ignored (cancel mail)
             elif recipient == recipient_falsy_1:
-                # TDE FIXME: currently setting False as email
-                # recipient_info['state'] = 'ignored'
-                # recipient_info['email'] = recipient.email_from  # normalized is False but email should be falsymail
                 recipient_info['state'] = 'ignored'
-                recipient_info['email'] = False
+                recipient_info['email'] = recipient.email_from  # normalized is False but email should be falsymail
             else:
                 email = self._find_sent_mail_wemail(recipient.email_normalized)
                 # preview correctly integrated rendered jinja