diff --git a/base/src/org/compiere/process/ImportInvoice.java b/base/src/org/compiere/process/ImportInvoice.java
index b20e188dd9..e650039808 100644
--- a/base/src/org/compiere/process/ImportInvoice.java
+++ b/base/src/org/compiere/process/ImportInvoice.java
@@ -554,7 +554,7 @@ public class ImportInvoice extends SvrProcess
 						continue;
 					//
 					bpl = new MBPartnerLocation (bp);
-					bpl.setC_Location_ID (imp.getC_Location_ID ());
+					bpl.setC_Location_ID (imp.getC_Location_ID() > 0 ? imp.getC_Location_ID() : loc.getC_Location_ID());
 					if (!bpl.save ())
 						continue;
 				}