diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 86ded7246b9..df633272835 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -459,10 +459,8 @@ class MassMailing(models.Model):
                 self.mailing_domain = "[('list_ids', 'in', [%s]), ('opt_out', '=', False)]" % (','.join(map(str,self.contact_list_ids.ids)),)
             else:
                 self.mailing_domain = "[(0, '=', 1)]"
-        elif 'opt_out' in self.env[self.mailing_model]._fields:
+        elif 'opt_out' in self.env[self.mailing_model]._fields and not self.mailing_domain:
             self.mailing_domain = "[('opt_out', '=', False)]"
-        else:
-            self.mailing_domain = []
         self.body_html = "on_change_model_and_list"
 
     #------------------------------------------------------