diff --git a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactory.java b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactory.java
index 6c22c57b5..29be9abfb 100644
--- a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactory.java
+++ b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactory.java
@@ -270,7 +270,7 @@ private static Dialog createDialog(final String baseURI, final String genericBas
 		{
 			// TODO: Do we chop off everything after the port and then append the dialog URI?
 			//		 For now just assume that the dialog URI builds on top of the baseURI.
-			uri = resolvePathParameters(baseURI, null, dialogURI, pathParameterValues);
+			uri = resolvePathParameters(genericBaseURI, null, dialogURI, pathParameterValues);
 		}
 		else
 		{