diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/WDrillReport.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/WDrillReport.java
index e333c537b6..55ea7109f4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/WDrillReport.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/WDrillReport.java
@@ -387,7 +387,9 @@ public class WDrillReport extends Window implements EventListener<Event>  {
 	
 	private KeyNamePair findTablePrintFormat(KeyNamePair drillTable) {
 		
-		Integer printFormatID = new Query(Env.getCtx(), MPrintFormat.Table_Name, " AD_Table_ID = ? ", null).setParameters(drillTable.getKey()).firstId();
+		Integer printFormatID = new Query(Env.getCtx(), MPrintFormat.Table_Name, " AD_Table_ID = ? AND AD_Client_ID IN (0,?) ", null)
+				.setOrderBy(" IsDefault DESC, Created DESC ")
+				.setParameters(drillTable.getKey(), Env.getAD_Client_ID(Env.getCtx())).firstId();
 		return new KeyNamePair((printFormatID != null && printFormatID > 0) ? printFormatID : 0, drillTable.getName());
 	}