diff --git a/addons/account/wizard/account_payment_register.py b/addons/account/wizard/account_payment_register.py
index 46285766072..785b4fce216 100644
--- a/addons/account/wizard/account_payment_register.py
+++ b/addons/account/wizard/account_payment_register.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from collections import defaultdict
 
-from odoo import models, fields, api, _
+from odoo import Command, models, fields, api, _
 from odoo.exceptions import UserError
 from odoo.tools import frozendict
 
@@ -418,14 +418,10 @@ class AccountPaymentRegister(models.TransientModel):
     @api.depends('payment_type', 'company_id', 'can_edit_wizard')
     def _compute_available_journal_ids(self):
         for wizard in self:
-            if wizard.can_edit_wizard:
-                batch = wizard._get_batches()[0]
-                wizard.available_journal_ids = wizard._get_batch_available_journals(batch)
-            else:
-                wizard.available_journal_ids = self.env['account.journal'].search([
-                    *self.env['account.journal']._check_company_domain(wizard.company_id),
-                    ('type', 'in', ('bank', 'cash')),
-                ])
+            available_journals = self.env['account.journal']
+            for batch in wizard._get_batches():
+                available_journals |= wizard._get_batch_available_journals(batch)
+            wizard.available_journal_ids = [Command.set(available_journals.ids)]
 
     @api.depends('available_journal_ids')
     def _compute_journal_id(self):