diff --git a/models/account_payment.py b/models/account_payment.py
index fc9cd18..b3eee8b 100644
--- a/models/account_payment.py
+++ b/models/account_payment.py
@@ -87,11 +87,10 @@ class AccountPayment(models.Model):
     def write(self, vals):
         # Propagate bypass flag during writes to avoid locked checks
         hr_expense_class = self._get_hr_expense_base_class()
-        if hr_expense_class and self._context.get('skip_expense_lock'):
-            return super(hr_expense_class, self).write(vals)
+        if hr_expense_class:
+            if self._context.get('skip_expense_lock') or any(p.expense_ids and p.state == 'draft' for p in self):
+                return super(hr_expense_class, self.with_context(skip_expense_lock=True)).write(vals)
 
-        if self.expense_ids and self.state == 'draft':
-            return super(AccountPayment, self.with_context(skip_expense_lock=True)).write(vals)
         return super().write(vals)
 
     def action_cancel(self):