diff --git a/account_payment_order/models/account_payment_order.py b/account_payment_order/models/account_payment_order.py
index 35772e95162..cf8b65a8f58 100644
--- a/account_payment_order/models/account_payment_order.py
+++ b/account_payment_order/models/account_payment_order.py
@@ -252,7 +252,7 @@ def cancel2draft(self):
 
     def action_cancel(self):
         # Unreconcile and cancel payments
-        self.payment_ids.action_draft()
+        self.payment_ids.filtered(lambda p: p.move_id.state != "draft").action_draft()
         self.payment_ids.action_cancel()
         self.write({"state": "cancel"})
         return True