diff --git a/lib/entry-points.js b/lib/entry-points.js
index 5eba16016..8768a09aa 100644
--- a/lib/entry-points.js
+++ b/lib/entry-points.js
@@ -148891,7 +148891,9 @@ async function getSupportedLanguageMap(codeql, logger2) {
   const resolveSupportedLanguagesUsingCli = await codeql.supportsFeature(
     "builtinExtractorsSpecifyDefaultQueries" /* BuiltinExtractorsSpecifyDefaultQueries */
   );
-  const resolveResult = await codeql.resolveLanguages();
+  const resolveResult = await codeql.resolveLanguages({
+    filterToLanguagesWithQueries: resolveSupportedLanguagesUsingCli
+  });
   if (resolveSupportedLanguagesUsingCli) {
     logger2.debug(
       `The CodeQL CLI supports the following languages: ${Object.keys(resolveResult.extractors).join(", ")}`
@@ -160464,7 +160466,6 @@ async function run3(actionState) {
     toolsSource = initCodeQLResult.toolsSource;
     zstdAvailability = initCodeQLResult.zstdAvailability;
     await codeql.getVersion();
-    await codeql.resolveLanguages();
     await checkWorkflow(logger2, codeql);
     if (
       // Only enable the experimental features env variable for Rust analysis if the user has explicitly
diff --git a/src/init-action.ts b/src/init-action.ts
index 3bc32a990..4830e44e3 100644
--- a/src/init-action.ts
+++ b/src/init-action.ts
@@ -327,10 +327,9 @@ async function run(actionState: ActionState<["Logger", "Env", "Actions"]>) {
     toolsSource = initCodeQLResult.toolsSource;
     zstdAvailability = initCodeQLResult.zstdAvailability;
 
-    // Populate the in-memory command cache with CLI version and languages.
-    // These results will be persisted to disk at the end of the init action.
+    // Populate the in-memory command cache with CLI version.
+    // This result will be persisted to disk at the end of the init action.
     await codeql.getVersion();
-    await codeql.resolveLanguages();
 
     // Check the workflow for problems. If there are any problems, they are reported
     // to the workflow log. No exceptions are thrown.