diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 286c010cf3d60b4af949dbe7486059dc178e0058..268480e332fb73caa39ab50954464bbb0c98ae46 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -1055,7 +1055,8 @@ class AccountMove(models.Model):
     def _compute_suitable_journal_ids(self):
         for m in self:
             journal_type = m.invoice_filter_type_domain or 'general'
-            domain = [('company_id', '=', m.company_id.id), ('type', '=', journal_type)]
+            company_id = m.company_id.id or self.env.company.id
+            domain = [('company_id', '=', company_id), ('type', '=', journal_type)]
             m.suitable_journal_ids = self.env['account.journal'].search(domain)
 
     @api.depends('posted_before', 'state', 'journal_id', 'date')