diff --git a/lib/init-action.js b/lib/init-action.js
index 7ab924d66..eb3e7e81f 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -106501,14 +106501,15 @@ async function getOverlayDatabaseMode(codeql, features, languages, sourceRoot, b
   const checkOverlayStatus = await features.getValue(
     "overlay_analysis_status_check" /* OverlayAnalysisStatusCheck */
   );
-  const diskUsage = performResourceChecks || checkOverlayStatus ? await checkDiskUsage(logger) : void 0;
-  if ((performResourceChecks || checkOverlayStatus) && diskUsage === void 0) {
+  const needDiskUsage = performResourceChecks || checkOverlayStatus;
+  const diskUsage = needDiskUsage ? await checkDiskUsage(logger) : void 0;
+  if (needDiskUsage && diskUsage === void 0) {
     logger.warning(
       `Unable to determine disk usage, therefore setting overlay database mode to ${"none" /* None */}.`
     );
     return new Failure("unable-to-determine-disk-usage" /* UnableToDetermineDiskUsage */);
   }
-  const resourceResult = performResourceChecks && diskUsage ? await checkRunnerResources(
+  const resourceResult = performResourceChecks && diskUsage !== void 0 ? await checkRunnerResources(
     codeql,
     diskUsage,
     ramInput,
@@ -106518,7 +106519,7 @@ async function getOverlayDatabaseMode(codeql, features, languages, sourceRoot, b
   if (resourceResult.isFailure()) {
     return resourceResult;
   }
-  if (checkOverlayStatus && diskUsage && await shouldSkipOverlayAnalysis(codeql, languages, diskUsage, logger)) {
+  if (checkOverlayStatus && diskUsage !== void 0 && await shouldSkipOverlayAnalysis(codeql, languages, diskUsage, logger)) {
     logger.info(
       `Setting overlay database mode to ${"none" /* None */} because overlay analysis previously failed with this combination of languages, disk space, and CodeQL version.`
     );
diff --git a/src/config-utils.ts b/src/config-utils.ts
index 2fe9ce546..ac3df08f4 100644
--- a/src/config-utils.ts
+++ b/src/config-utils.ts
@@ -869,21 +869,16 @@ export async function getOverlayDatabaseMode(
   const checkOverlayStatus = await features.getValue(
     Feature.OverlayAnalysisStatusCheck,
   );
-  const diskUsage =
-    performResourceChecks || checkOverlayStatus
-      ? await checkDiskUsage(logger)
-      : undefined;
-  if (
-    (performResourceChecks || checkOverlayStatus) &&
-    diskUsage === undefined
-  ) {
+  const needDiskUsage = performResourceChecks || checkOverlayStatus;
+  const diskUsage = needDiskUsage ? await checkDiskUsage(logger) : undefined;
+  if (needDiskUsage && diskUsage === undefined) {
     logger.warning(
       `Unable to determine disk usage, therefore setting overlay database mode to ${OverlayDatabaseMode.None}.`,
     );
     return new Failure(OverlayDisabledReason.UnableToDetermineDiskUsage);
   }
   const resourceResult =
-    performResourceChecks && diskUsage
+    performResourceChecks && diskUsage !== undefined
       ? await checkRunnerResources(
           codeql,
           diskUsage,
@@ -897,7 +892,7 @@ export async function getOverlayDatabaseMode(
   }
   if (
     checkOverlayStatus &&
-    diskUsage &&
+    diskUsage !== undefined &&
     (await shouldSkipOverlayAnalysis(codeql, languages, diskUsage, logger))
   ) {
     logger.info(