diff --git a/account_banking_payment/model/payment_order_create.py b/account_banking_payment/model/payment_order_create.py
index 8199fca25..36c0f3aeb 100644
--- a/account_banking_payment/model/payment_order_create.py
+++ b/account_banking_payment/model/payment_order_create.py
@@ -98,8 +98,12 @@ class payment_order_create(orm.TransientModel):
                     # customer invoice number (in the case of debit order)
                     communication = line.invoice.number.replace('/', '')
                     state = 'structured'
-                    if communication != line.ref:
+                    if line.invoice.number != line.ref:
                         communication2 = line.ref
+            else:
+                state = 'normal'
+                communication2 = line.ref
+
             # support debit orders when enabled
             if (payment.payment_order_type == 'debit' and
                 'amount_to_receive' in line):