diff --git a/lib/entry-points.js b/lib/entry-points.js
index 54de6e355..648af08cb 100644
--- a/lib/entry-points.js
+++ b/lib/entry-points.js
@@ -152288,7 +152288,8 @@ async function getCodeQLSource(toolsInput, defaultCliVersion, rawLanguages, useO
     bundle = await getLatestNightlyBundle(
       { env: getEnv(), features, logger },
       rawLanguages,
-      variant
+      variant,
+      tarSupportsZstd
     );
     toolsInput = bundle.url;
   }
@@ -152727,12 +152728,10 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) {
 function getTempExtractionDir(tempDir) {
   return path13.join(tempDir, v4_default());
 }
-async function getLatestNightlyBundle(action, rawLanguages, variant) {
-  const { logger } = action;
-  const zstdAvailability = await isZstdAvailable(logger);
+async function getLatestNightlyBundle(action, rawLanguages, variant, tarSupportsZstd) {
   const compressionMethod = await useZstdBundle(
     CODEQL_VERSION_ZSTD_BUNDLE,
-    zstdAvailability.available
+    tarSupportsZstd
   ) ? "zstd" : "gzip";
   const platform2 = getBundlePlatform();
   const language = await getPerLanguageBundleLanguage(action, {
diff --git a/src/setup-codeql.test.ts b/src/setup-codeql.test.ts
index bc902acb2..608c36949 100644
--- a/src/setup-codeql.test.ts
+++ b/src/setup-codeql.test.ts
@@ -428,7 +428,7 @@ test.serial(
         false, // useOverlayAwareDefaultCliVersion
         SAMPLE_DOTCOM_API_DETAILS,
         GitHubVariant.DOTCOM,
-        false,
+        true, // tarSupportsZstd
         features,
         logger,
       );
@@ -498,7 +498,7 @@ test.serial(
         false, // useOverlayAwareDefaultCliVersion
         SAMPLE_DOTCOM_API_DETAILS,
         GitHubVariant.DOTCOM,
-        false,
+        true, // tarSupportsZstd
         features,
         logger,
       );
diff --git a/src/setup-codeql.ts b/src/setup-codeql.ts
index 3ef2a9733..d4f3c888b 100644
--- a/src/setup-codeql.ts
+++ b/src/setup-codeql.ts
@@ -493,6 +493,7 @@ export async function getCodeQLSource(
       { env: getEnv(), features, logger },
       rawLanguages,
       variant,
+      tarSupportsZstd,
     );
     toolsInput = bundle.url;
   }
@@ -1178,13 +1179,12 @@ async function getLatestNightlyBundle(
   action: ActionState<["Logger", "ReadOnlyEnv", "FeatureFlags"]>,
   rawLanguages: string[] | undefined,
   variant: util.GitHubVariant,
+  tarSupportsZstd: boolean,
 ): Promise<CodeQLBundle> {
-  const { logger } = action;
-  const zstdAvailability = await tar.isZstdAvailable(logger);
   // The nightly is guaranteed to have a zstd bundle
   const compressionMethod = (await useZstdBundle(
     CODEQL_VERSION_ZSTD_BUNDLE,
-    zstdAvailability.available,
+    tarSupportsZstd,
   ))
     ? "zstd"
     : "gzip";