diff --git a/modules/account_payment/account.py b/modules/account_payment/account.py
index 50706307df..5e5a138f7d 100644
--- a/modules/account_payment/account.py
+++ b/modules/account_payment/account.py
@@ -281,7 +281,10 @@ class MoveLine(metaclass=PoolMeta):
                 ('debit', '>', 0),
                 ('credit', '<', 0),
                 ],
-            ('maturity_date', '<=', date),
+            ['OR',
+                ('maturity_date', '<=', date),
+                ('maturity_date', '=', None),
+                ],
             ('payment_blocked', '!=', True),
             ]
 
diff --git a/modules/account_payment/party.py b/modules/account_payment/party.py
index 9b8c75ee64..e6e21045f6 100644
--- a/modules/account_payment/party.py
+++ b/modules/account_payment/party.py
@@ -165,7 +165,10 @@ class PartyReceptionDirectDebit(
             ('reconciliation', '=', None),
             ('payment_amount', '!=', 0),
             ('move_state', '=', 'posted'),
-            ('maturity_date', '<=', date),
+            ['OR',
+                ('maturity_date', '<=', date),
+                ('maturity_date', '=', None),
+                ],
             ('payment_blocked', '!=', True),
             ]