diff --git a/addons/mass_mailing/models/mailing.py b/addons/mass_mailing/models/mailing.py
index 5136ae91624..abc63381bf7 100644
--- a/addons/mass_mailing/models/mailing.py
+++ b/addons/mass_mailing/models/mailing.py
@@ -771,8 +771,6 @@ class MassMailing(models.Model):
 
         if self.mailing_type == 'mail' and 'is_blacklisted' in self.env[self.mailing_model_name]._fields:
             mailing_domain = expression.AND([[('is_blacklisted', '=', False)], mailing_domain])
-        if self.mailing_type == 'mail' and 'opt_out' in self.env[self.mailing_model_name]._fields:
-            mailing_domain = expression.AND([[('opt_out', '=', False)], mailing_domain])
 
         return mailing_domain
 
diff --git a/addons/mass_mailing/models/mailing_contact.py b/addons/mass_mailing/models/mailing_contact.py
index 95627f4260e..6ebd1132820 100644
--- a/addons/mass_mailing/models/mailing_contact.py
+++ b/addons/mass_mailing/models/mailing_contact.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import api, fields, models, tools, _
-from odoo.exceptions import UserError
+from odoo import api, fields, models
+from odoo.osv import expression
 
 
 class MassMailingContactListRel(models.Model):
@@ -77,7 +77,7 @@ class MassMailingContact(models.Model):
             contacts = self.env['mailing.contact.subscription'].search([('list_id', '=', active_list_id)])
             return [('id', 'in', [record.contact_id.id for record in contacts if record.opt_out == value])]
         else:
-            raise UserError(_('Search opt out cannot be executed without a unique and valid active mailing list context.'))
+            return expression.FALSE_DOMAIN if value else expression.TRUE_DOMAIN
 
     @api.depends('subscription_list_ids')
     def _compute_opt_out(self):