diff --git a/src/lib/eina/eina_debug_cpu.c b/src/lib/eina/eina_debug_cpu.c
index b4c3cf49c4..931139f5c0 100644
--- a/src/lib/eina/eina_debug_cpu.c
+++ b/src/lib/eina/eina_debug_cpu.c
@@ -281,11 +281,14 @@ _stop_cpu_thread(void)
      {
         usleep(1000);
         eina_lock_take(&_sysmon_lock);
-        if (_eina_debug_cpu_active == -1) break;
+        if (_eina_debug_cpu_active == -1)
+          {
+             _eina_debug_cpu_active = 0;
+             eina_lock_release(&_sysmon_lock);
+             break;
+          }
         eina_lock_release(&_sysmon_lock);
      }
-   _eina_debug_cpu_active = 0;
-   eina_lock_release(&_sysmon_lock);
 }
 
 static Eina_Bool