diff --git a/java/src/main/java/com/genexus/GXDbFile.java b/java/src/main/java/com/genexus/GXDbFile.java
index 913bf1478..b93ca607e 100644
--- a/java/src/main/java/com/genexus/GXDbFile.java
+++ b/java/src/main/java/com/genexus/GXDbFile.java
@@ -134,7 +134,8 @@ public static String generateUri(String file, Boolean addToken, Boolean addSchem
 		{
 			name = PrivateUtilities.encodeFileName(name);
 		}
-		name = PrivateUtilities.checkFileNameLength(file.replace(name, ""), name, type);
+		else
+			name = PrivateUtilities.checkFileNameLength(file.replace(name, ""), name, type);
 				
 		if (!addScheme)
 		{