diff --git a/models/account_payment.py b/models/account_payment.py
index 07a95bb..0ff970f 100644
--- a/models/account_payment.py
+++ b/models/account_payment.py
@@ -63,9 +63,9 @@ class AccountPayment(models.Model):
                 )
             )
 
-            if company_currency.is_zero(residual) and not company_currency.is_zero(liquidity_residual):
+            if not company_currency.is_zero(liquidity_residual):
                 residual = liquidity_residual
-            if payment_currency.is_zero(residual_currency) and not payment_currency.is_zero(liquidity_residual_currency):
+            if not payment_currency.is_zero(liquidity_residual_currency):
                 residual_currency = liquidity_residual_currency
 
             pay.payment_residual = abs(residual)