diff --git a/src/helma/framework/core/Application.java b/src/helma/framework/core/Application.java
index 519f3053..ac1ae56c 100644
--- a/src/helma/framework/core/Application.java
+++ b/src/helma/framework/core/Application.java
@@ -495,7 +495,8 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
 	String base = props.getProperty ("baseURI");
 	String siteroot = props.getProperty ("rootPrototype");
 	
-	if (base != null) setBaseURI (base);
+	if (base != null || baseURI == null)
+	    setBaseURI (base);
 	String href = n.getUrl (root, users, tmpname, siteroot);
 	
 	return baseURI + href;