diff --git a/libraries/src/Document/Renderer/Html/ScriptsRenderer.php b/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
index b1819c578dec8..78f2f36f6f764 100644
--- a/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
@@ -186,7 +186,11 @@ private function renderElement($item): string
 
         // Check if script uses media version.
         if ($version && !str_contains($src, '?') && ($mediaVersion || $version !== 'auto')) {
-            $src .= '?' . ($version === 'auto' ? $mediaVersion : $version);
+            $src .= '?' . match ($version) {
+                'auto'    => $mediaVersion,
+                'nocache' => 'nocache-' . rand(0, 1_000_000),
+                default   => $version,
+            };
         }
 
         $buffer .= $tab;
@@ -358,7 +362,11 @@ private function renderImportmap(array &$assets)
 
             // Check if script uses media version.
             if ($version && !str_contains($src, '?') && !str_ends_with($src, '/') && ($mediaVersion || $version !== 'auto')) {
-                $src .= '?' . ($version === 'auto' ? $mediaVersion : $version);
+                $src .= '?' . match ($version) {
+                    'auto'    => $mediaVersion,
+                    'nocache' => 'nocache-' . rand(0, 1_000_000),
+                    default   => $version,
+                };
             }
 
             if (!$esmScope) {
diff --git a/libraries/src/Document/Renderer/Html/StylesRenderer.php b/libraries/src/Document/Renderer/Html/StylesRenderer.php
index 45a6aa39a7a4d..b6ddbcae15ecf 100644
--- a/libraries/src/Document/Renderer/Html/StylesRenderer.php
+++ b/libraries/src/Document/Renderer/Html/StylesRenderer.php
@@ -175,7 +175,11 @@ private function renderElement($item): string
 
         // Check if script uses media version.
         if ($version && !str_contains($src, '?') && ($mediaVersion || $version !== 'auto')) {
-            $src .= '?' . ($version === 'auto' ? $mediaVersion : $version);
+            $src .= '?' . match ($version) {
+                'auto'    => $mediaVersion,
+                'nocache' => 'nocache-' . rand(0, 1_000_000),
+                default   => $version,
+            };
         }
 
         $buffer .= $tab;