diff --git a/account_group_invoices/models/account_invoice.py b/account_group_invoices/models/account_invoice.py
index a0b0f719f..5c1f68c59 100644
--- a/account_group_invoices/models/account_invoice.py
+++ b/account_group_invoices/models/account_invoice.py
@@ -144,7 +144,7 @@ def _get_fpos_journal(self, inv):
         company = inv['company']
         fpos_id = journal_id = False
 
-        if 'fpos' in inv:
+        if 'fpos' in inv and inv['fpos']:
             fpos_id = afp.browse(inv['fpos'])
         else:
             fpos_id = inv['partner'].with_context(
diff --git a/br_account_einvoice/models/invoice_eletronic.py b/br_account_einvoice/models/invoice_eletronic.py
index aae7afec2..4914a16fd 100644
--- a/br_account_einvoice/models/invoice_eletronic.py
+++ b/br_account_einvoice/models/invoice_eletronic.py
@@ -486,10 +486,8 @@ def send_email_nfe(self):
         if not mail:
             raise UserError('Modelo de email padrão não configurado')
         atts = self._find_attachment_ids_email()
-        values = {
-            "attachment_ids": atts + mail.attachment_ids.ids
-        }
-        mail.send_mail(self.invoice_id.id, email_values=values)
+        self.invoice_id.message_post_with_template(
+            mail.id, attachment_ids=[(6, 0, atts + mail.attachment_ids.ids)])
 
     @api.multi
     def send_email_nfe_queue(self):