diff --git a/firmware/util/rfiutil.h b/firmware/util/rfiutil.h
index b0a79076c9..34950d3db0 100644
--- a/firmware/util/rfiutil.h
+++ b/firmware/util/rfiutil.h
@@ -19,13 +19,8 @@
  * Unfortunately ChibiOS has two versions of methods for different
  * contexts.
  */
-#ifndef SIMULATOR
 #define isLocked() (ch.dbg.lock_cnt > 0)
 #define isIsrContext() (ch.dbg.isr_cnt > 0)
-#else
-#define isLocked() (0)
-#define isIsrContext() (0)
-#endif
 
 #ifdef __cplusplus
 extern "C"
diff --git a/simulator/chconf.h b/simulator/chconf.h
index 3b333813db..16c7d2826e 100644
--- a/simulator/chconf.h
+++ b/simulator/chconf.h
@@ -339,7 +339,10 @@
  *
  * @note    The default is @p FALSE.
  */
-#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#define CH_DBG_SYSTEM_STATE_CHECK           TRUE
+
+  #define ON_LOCK_HOOK
+  #define ON_UNLOCK_HOOK
 
 #define USE_PORT_LOCK TRUE