diff --git a/os/rt/include/chdebug.h b/os/rt/include/chdebug.h
index 3c49bb303..46815b66a 100644
--- a/os/rt/include/chdebug.h
+++ b/os/rt/include/chdebug.h
@@ -61,8 +61,8 @@
 /*===========================================================================*/
 
 #if CH_DBG_SYSTEM_STATE_CHECK == TRUE
-#define _dbg_enter_lock() (ch.dbg.lock_cnt = (cnt_t)1)
-#define _dbg_leave_lock() (ch.dbg.lock_cnt = (cnt_t)0)
+#define _dbg_enter_lock() (ch.dbg.lock_cnt = (cnt_t)1; ON_LOCK_HOOK;)
+#define _dbg_leave_lock() (ON_UNLOCK_HOOK; ch.dbg.lock_cnt = (cnt_t)0;)
 #endif
 
 /* When the state checker feature is disabled then the following functions
@@ -166,4 +166,4 @@ extern "C" {
 
 #endif /* CHDEBUG_H */
 
-/** @} */
+/** @} */