diff --git a/addons/sale/models/account_invoice.py b/addons/sale/models/account_invoice.py
index 0a2406a0968..c705c793c93 100644
--- a/addons/sale/models/account_invoice.py
+++ b/addons/sale/models/account_invoice.py
@@ -41,7 +41,7 @@ class AccountInvoice(models.Model):
         self.partner_shipping_id = addr and addr.get('delivery')
         if self.env.context.get('type', 'out_invoice') == 'out_invoice':
             company = self.company_id or self.env.user.company_id
-            self.comment = company.with_context(lang=self.partner_id.lang).sale_note
+            self.comment = company.with_context(lang=self.partner_id.lang).sale_note or (self._origin.company_id == company and self.comment)
 
     @api.multi
     def action_invoice_paid(self):