diff --git a/lib/init-action.js b/lib/init-action.js
index 32bbf5873..e070d37cf 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -106568,19 +106568,16 @@ async function isTrapCachingEnabled(features, overlayDatabaseMode) {
   }
   return true;
 }
-async function setCppTrapCachingEnvironmentVariables(config, codeql, logger) {
+async function setCppTrapCachingEnvironmentVariables(config, logger) {
   if (config.languages.includes("cpp" /* cpp */)) {
     const envVar = "CODEQL_EXTRACTOR_CPP_TRAP_CACHING";
     if (process.env[envVar]) {
       logger.info(
-        `Environment variable ${envVar} already set. Not en/disabling CodeQL C++ TRAP caching support`
+        `Environment variable ${envVar} already set, leaving it unchanged.`
       );
-    } else if (await codeQlVersionAtLeast(codeql, "2.17.5")) {
-      logger.info("Enabling CodeQL C++ TRAP caching support");
-      core9.exportVariable(envVar, "true");
     } else {
-      logger.info("Disabling CodeQL C++ TRAP caching support");
-      core9.exportVariable(envVar, "false");
+      logger.info("Enabling CodeQL C++ TRAP caching support.");
+      core9.exportVariable(envVar, "true");
     }
   }
 }
@@ -106719,7 +106716,7 @@ async function initConfig(features, inputs) {
     );
     config.trapCaches = trapCaches;
     config.trapCacheDownloadTime = trapCacheDownloadTime;
-    await setCppTrapCachingEnvironmentVariables(config, inputs.codeql, logger);
+    await setCppTrapCachingEnvironmentVariables(config, logger);
   }
   return config;
 }
diff --git a/src/config-utils.ts b/src/config-utils.ts
index 7bb295f2b..b85d2c0fe 100644
--- a/src/config-utils.ts
+++ b/src/config-utils.ts
@@ -1024,21 +1024,17 @@ async function isTrapCachingEnabled(
 
 async function setCppTrapCachingEnvironmentVariables(
   config: Config,
-  codeql: CodeQL,
   logger: Logger,
 ): Promise<void> {
   if (config.languages.includes(KnownLanguage.cpp)) {
     const envVar = "CODEQL_EXTRACTOR_CPP_TRAP_CACHING";
     if (process.env[envVar]) {
       logger.info(
-        `Environment variable ${envVar} already set. Not en/disabling CodeQL C++ TRAP caching support`,
+        `Environment variable ${envVar} already set, leaving it unchanged.`,
       );
-    } else if (await codeQlVersionAtLeast(codeql, "2.17.5")) {
-      logger.info("Enabling CodeQL C++ TRAP caching support");
-      core.exportVariable(envVar, "true");
     } else {
-      logger.info("Disabling CodeQL C++ TRAP caching support");
-      core.exportVariable(envVar, "false");
+      logger.info("Enabling CodeQL C++ TRAP caching support.");
+      core.exportVariable(envVar, "true");
     }
   }
 }
@@ -1243,7 +1239,7 @@ export async function initConfig(
     config.trapCaches = trapCaches;
     config.trapCacheDownloadTime = trapCacheDownloadTime;
 
-    await setCppTrapCachingEnvironmentVariables(config, inputs.codeql, logger);
+    await setCppTrapCachingEnvironmentVariables(config, logger);
   }
 
   return config;