diff --git a/cache/classes/loaders.php b/cache/classes/loaders.php
index 58374aba77b..32ccdf16bae 100644
--- a/cache/classes/loaders.php
+++ b/cache/classes/loaders.php
@@ -1690,7 +1690,7 @@ class cache_application extends cache implements cache_loader_with_locking {
         $after = microtime(true);
         if ($lock) {
             $this->locks[$key] = $lock;
-            if (defined('MDL_PERF') || !empty($CFG->perfdebug)) {
+            if ((defined('MDL_PERF') && MDL_PERF) || $this->perfdebug) {
                 \core\lock\timing_wrapper_lock_factory::record_lock_data($after, $before,
                         $this->get_definition()->get_id(), $key, $lock, $this->get_identifier() . $key);
             }
@@ -1735,7 +1735,7 @@ class cache_application extends cache implements cache_loader_with_locking {
         }
         if ($released && array_key_exists($key, $this->locks)) {
             unset($this->locks[$key]);
-            if (defined('MDL_PERF') || !empty($CFG->perfdebug)) {
+            if ((defined('MDL_PERF') && MDL_PERF) || $this->perfdebug) {
                 \core\lock\timing_wrapper_lock_factory::record_lock_released_data($this->get_identifier() . $key);
             }
         }