diff --git a/java/src/main/java/com/genexus/internet/HttpContext.java b/java/src/main/java/com/genexus/internet/HttpContext.java
index 9fffa2d7d..3cf08eec1 100644
--- a/java/src/main/java/com/genexus/internet/HttpContext.java
+++ b/java/src/main/java/com/genexus/internet/HttpContext.java
@@ -356,6 +356,7 @@ public void AddJavascriptSource(String jsSrc, String urlBuildNumber, boolean use
 	{
 		if(!javascriptSources.contains(jsSrc))
 		{
+			urlBuildNumber = getURLBuildNumber(jsSrc, urlBuildNumber);
 			javascriptSources.add(jsSrc);
 			String queryString = urlBuildNumber;
 			String attributes = "";
@@ -486,9 +487,22 @@ public void AddStyleSheetFile(String styleSheet)
 	}
 	public void AddStyleSheetFile(String styleSheet, String urlBuildNumber)
 	{
+		urlBuildNumber = getURLBuildNumber(styleSheet, urlBuildNumber);
 		AddStyleSheetFile(styleSheet, urlBuildNumber, false);
 	}
 
+	private String getURLBuildNumber(String styleSheet, String urlBuildNumber)
+	{
+		if(urlBuildNumber.isEmpty() && !GXutil.isAbsoluteURL(styleSheet))
+		{
+			return "?" + getCacheInvalidationToken();
+		}
+		else
+		{
+			return urlBuildNumber;
+		}
+	}
+
 	private void AddStyleSheetFile(String styleSheet, String urlBuildNumber, boolean isGxThemeHidden)
 	{
 		AddStyleSheetFile( styleSheet, urlBuildNumber, isGxThemeHidden, false);