diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
index 746d7fcd0..8cfaeab5a 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
@@ -270,7 +270,10 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
 		sql.append("  bpe.nprot, ");
 		sql.append("  coalesce(c.numserie_bpe, '1') as numserie_bpe, ");
 		sql.append("  c.categoria_id, ");
-		sql.append("  e.codestabelecimento as cod_estabelecimento, ");
+		/**
+		 * Mantis 18267
+		 */
+		sql.append("  ei.codestabelecimento as cod_estabelecimento, ");
 		sql.append("  ep.crtbpe as crt, ");
 		sql.append("  ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) as valortributado, ");
 		sql.append("  ei.porcredbaseicms as red_base_calc_estadual, ");
@@ -377,7 +380,10 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
 		sql.append("  bpe.nprot, ");
 		sql.append("  coalesce(c.numserie_bpe, '1') as numserie_bpe, ");
 		sql.append("  c.categoria_id, ");
-		sql.append("  e.codestabelecimento as cod_estabelecimento, ");
+		/**
+		 * Mantis 18267
+		 */
+		sql.append("  ei.codestabelecimento as cod_estabelecimento, ");
 		sql.append("  ep.crtbpe as crt, ");
 		sql.append("  ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) as valortributado, ");
 		sql.append("  ei.porcredbaseicms as red_base_calc_estadual, ");
diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java b/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java
index a4f5489aa..89bf0ab90 100644
--- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java
+++ b/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java
@@ -101,7 +101,10 @@ public class ExportacaoBpe {
 	private void adicionarRegistroBPETipoBEP(final StringBuilder sb, ExportacaoBPETipoBPE tipoBPE, boolean isVersao131) {
 
 		String tipoRegistro = "BPE";
-		String estabelecimento = tipoBPE.getEstabelecimento();
+		/**
+		 * Mantis 18267
+		 */
+		String estabelecimento = StringUtils.isBlank(tipoBPE.getEstabelecimento()) ? VAZIO : tipoBPE.getEstabelecimento();
 		String chaveEletrônica = tipoBPE.getChaveEletronica();
 		String serie = tipoBPE.getSerie();
 		String numero = tipoBPE.getNumero();