diff --git a/libraries/AP_AHRS/AP_AHRS.cpp b/libraries/AP_AHRS/AP_AHRS.cpp
index 9816e11b3c..a37ac73bbd 100644
--- a/libraries/AP_AHRS/AP_AHRS.cpp
+++ b/libraries/AP_AHRS/AP_AHRS.cpp
@@ -3141,7 +3141,7 @@ void AP_AHRS::Log_Write()
     Write_AHRS2();
     Write_POS();
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
+#if AP_AHRS_SIM_ENABLED
     AP::sitl()->Log_Write_SIMSTATE();
 #endif
 }
diff --git a/libraries/AP_AHRS/AP_AHRS.h b/libraries/AP_AHRS/AP_AHRS.h
index c2da9f2185..a58ab57df7 100644
--- a/libraries/AP_AHRS/AP_AHRS.h
+++ b/libraries/AP_AHRS/AP_AHRS.h
@@ -33,7 +33,7 @@
 #endif
 
 #ifndef AP_AHRS_SIM_ENABLED
-#define AP_AHRS_SIM_ENABLED (CONFIG_HAL_BOARD == HAL_BOARD_SITL)
+#define AP_AHRS_SIM_ENABLED AP_SIM_ENABLED
 #endif
 
 #if AP_AHRS_SIM_ENABLED