diff --git a/libraries/AP_Compass/AP_Compass.cpp b/libraries/AP_Compass/AP_Compass.cpp
index cf2570334bf..0a6ecd09938 100644
--- a/libraries/AP_Compass/AP_Compass.cpp
+++ b/libraries/AP_Compass/AP_Compass.cpp
@@ -1131,16 +1131,15 @@ void Compass::_probe_external_i2c_compasses(void)
         RETURN_IF_NO_SPACE;
     }
 
-#if AP_COMPASS_INTERNAL_BUS_PROBING_ENABLED
-    if (AP_BoardConfig::get_board_type() != AP_BoardConfig::PX4_BOARD_MINDPXV2 &&
-        AP_BoardConfig::get_board_type() != AP_BoardConfig::PX4_BOARD_AEROFC) {
+#if AP_COMPASS_HMC5843_INTERNAL_BUS_PROBING_ENABLED
+    if (AP_BoardConfig::get_board_type() != AP_BoardConfig::PX4_BOARD_AEROFC) {
         // internal i2c bus
         FOREACH_I2C_INTERNAL(i) {
             probe_i2c_dev(DRIVER_HMC5843, AP_Compass_HMC5843::probe, i, HAL_COMPASS_HMC5843_I2C_ADDR, all_external, all_external?ROTATION_ROLL_180:ROTATION_YAW_270);
             RETURN_IF_NO_SPACE;
         }
     }
-#endif  // AP_COMPASS_INTERNAL_BUS_PROBING_ENABLED
+#endif  // AP_COMPASS_KMC5843_INTERNAL_BUS_PROBING_ENABLED
 #endif  // AP_COMPASS_HMC5843_ENABLED
 
 #if AP_COMPASS_QMC5883L_ENABLED
diff --git a/libraries/AP_Compass/AP_Compass_config.h b/libraries/AP_Compass/AP_Compass_config.h
index bd7535d1f6c..3e5fb3bf022 100644
--- a/libraries/AP_Compass/AP_Compass_config.h
+++ b/libraries/AP_Compass/AP_Compass_config.h
@@ -159,4 +159,9 @@
 
 #ifndef AP_COMPASS_LIS2MDL_EXTERNAL_BUS_PROBING_ENABLED
 #define AP_COMPASS_LIS2MDL_EXTERNAL_BUS_PROBING_ENABLED (AP_COMPASS_LIS2MDL_ENABLED && AP_COMPASS_PROBING_ENABLED)
-#endif
+#endif  // AP_COMPASS_LIS2MDL_EXTERNAL_BUS_PROBING_ENABLED
+
+#ifndef AP_COMPASS_HMC5843_INTERNAL_BUS_PROBING_ENABLED
+#define AP_COMPASS_HMC5843_INTERNAL_BUS_PROBING_ENABLED (AP_COMPASS_HMC5843_ENABLED && AP_COMPASS_INTERNAL_BUS_PROBING_ENABLED)
+#endif  // AP_COMPASS_HMC5843_INTERNAL_BUS_PROBING_ENABLED
+