diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java
index a67875953..a1b2d223f 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java
@@ -89,7 +89,15 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
 		super.doAfterCompose(comp);
 	}
 
+	public void onSelect$cmbEstado(Event ev) {
+		buscaAidf();
+	}
+
 	public void onSelect$cmbEmpresa(Event ev) {
+		buscaAidf();
+	}
+
+	private void buscaAidf() {
 		Empresa empresa = null;
 		Estado estado = null;
 
@@ -104,21 +112,23 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
 			estado = (Estado) itemEstado.getValue();
 		}
 
-		lsAidf = aidfService.buscaAidfRMD(empresa.getEmpresaId(), estado.getEstadoId());
+		if (itemEmpresa != null && itemEstado != null) {
+			lsAidf = aidfService.buscaAidfRMD(empresa.getEmpresaId(), estado.getEstadoId());
 
-		ComboitemRenderer aidfRenderer = new ComboitemRenderer() {
-			public void render(Comboitem item, Object data) {
-				if (data instanceof Aidf) {
-					Aidf aidf = (Aidf) data;
-					item.setLabel(aidf.getDocfiscal() + " = " + aidf.getForminicial() + "-" + aidf.getFormfinal());
-				} else {
-					item.setLabel(Objects.toString(data));
+			ComboitemRenderer aidfRenderer = new ComboitemRenderer() {
+				public void render(Comboitem item, Object data) {
+					if (data instanceof Aidf) {
+						Aidf aidf = (Aidf) data;
+						item.setLabel(aidf.getDocfiscal() + " = " + aidf.getForminicial() + "-" + aidf.getFormfinal());
+					} else {
+						item.setLabel(Objects.toString(data));
+					}
+					item.setValue(data);
 				}
-				item.setValue(data);
-			}
-		};
-		cmbAidf.setItemRenderer(aidfRenderer);
-		cmbAidf.setModel(new BindingListModelList(lsAidf, true));
+			};
+			cmbAidf.setItemRenderer(aidfRenderer);
+			cmbAidf.setModel(new BindingListModelList(lsAidf, true));
+		}
 	}
 
 	public void onSelect$cmbAidf(Event ev) {