diff --git a/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php b/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php
index 254c4155df8..35422078c82 100644
--- a/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php
+++ b/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php
@@ -115,7 +115,7 @@ class PhpOpcacheSetup implements ISetupCheck {
 
 	public function run(): SetupResult {
 		// Skip OPcache checks if running from CLI
-		if (PHP_SAPI === 'cli') {
+		if (OC::$CLI && !$this->iniGetWrapper->getBool('opcache.enable_cli')) {
 			return SetupResult::success($this->l10n->t('Checking from CLI, OPcache checks have been skipped.'));
 		}