diff --git a/dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs b/dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs
index 6df03fe42..564e4b8df 100644
--- a/dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs
+++ b/dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs
@@ -823,7 +823,7 @@ public void AddStyleSheetFile(string styleSheet)
 
 		public string GetURLBuildNumber(string resourcePath, string urlBuildNumber)
 		{
-			if (string.IsNullOrEmpty(urlBuildNumber) && !PathUtil.IsAbsoluteUrl(resourcePath))
+			if (string.IsNullOrEmpty(urlBuildNumber) && !PathUtil.IsAbsoluteUrl(resourcePath) && !PathUtil.HasUrlQueryString(resourcePath))
 			{
 				return "?" + GetCacheInvalidationToken();
 			}
diff --git a/dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs b/dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs
index b0c9a327f..5fdab0585 100644
--- a/dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs
+++ b/dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs
@@ -3516,6 +3516,11 @@ public static bool IsAbsoluteUrl(string url)
 			return Uri.TryCreate(url, UriKind.Absolute, out result) && (result.Scheme == GXUri.UriSchemeHttp || result.Scheme == GXUri.UriSchemeHttps || result.Scheme == GXUri.UriSchemeFtp);
 		}
 
+		public static bool HasUrlQueryString(string url)
+		{
+			return url.Contains("?");
+		}
+
 		public static Uri GetBaseUri()
 		{
 			return new Uri(GxContext.StaticPhysicalPath() + Path.DirectorySeparatorChar.ToString());