diff --git a/src/drivers/boards/aerocore2/board_config.h b/src/drivers/boards/aerocore2/board_config.h
index 4a09792cdd..54f86aae4d 100644
--- a/src/drivers/boards/aerocore2/board_config.h
+++ b/src/drivers/boards/aerocore2/board_config.h
@@ -60,6 +60,8 @@
 #define GPIO_LED_BLUE	0
 #define GPIO_LED_SAFETY 0
 
+#define BOARD_HAS_CONTROL_STATUS_LEDS	1
+
 /* GPS */
 #define GPS_DEFAULT_UART_PORT	"/dev/ttyS0"
 
diff --git a/src/drivers/boards/aerofc-v1/board_config.h b/src/drivers/boards/aerofc-v1/board_config.h
index 1d1e958d56..578ae50b96 100644
--- a/src/drivers/boards/aerofc-v1/board_config.h
+++ b/src/drivers/boards/aerofc-v1/board_config.h
@@ -62,6 +62,8 @@
 #define GPIO_LED2		(GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN11)
 #define GPIO_LED3		(GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN12)
 
+#define BOARD_HAS_CONTROL_STATUS_LEDS	1
+
 #define GPIO_VDD_5V_SENSORS_EN	(GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTD|GPIO_PIN13)
 
 #define GPIO_FORCE_BOOTLOADER	(GPIO_INPUT|GPIO_PULLDOWN|GPIO_SPEED_50MHz|GPIO_PORTA|GPIO_PIN11|GPIO_EXTI)
diff --git a/src/drivers/boards/crazyflie/board_config.h b/src/drivers/boards/crazyflie/board_config.h
index 1727c124bd..671e420af4 100644
--- a/src/drivers/boards/crazyflie/board_config.h
+++ b/src/drivers/boards/crazyflie/board_config.h
@@ -70,6 +70,8 @@
 /* PX4: armed state indicator ; Stock FW: Blinking while charging */
 #define GPIO_LED_BLUE_L		(GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTD|GPIO_PIN2)
 
+#define BOARD_HAS_CONTROL_STATUS_LEDS	1
+
 #define LED_TX 4
 #define LED_RX 5
 
diff --git a/src/drivers/boards/px4fmu-v4/board_config.h b/src/drivers/boards/px4fmu-v4/board_config.h
index 17987c415d..3acdc60bbd 100644
--- a/src/drivers/boards/px4fmu-v4/board_config.h
+++ b/src/drivers/boards/px4fmu-v4/board_config.h
@@ -63,6 +63,8 @@
 #define GPIO_LED_GREEN               GPIO_LED2
 #define GPIO_LED_BLUE                GPIO_LED3
 
+#define BOARD_HAS_CONTROL_STATUS_LEDS      1
+
 /*  Define the Chip Selects for SPI1
  *  CS           Devices                                 DRDY
  *  ---- ----------------------------------------------- -----
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index 42c2f0decc..3c173323d8 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -3374,7 +3374,7 @@ control_status_leds(vehicle_status_s *status_local, const actuator_armed_s *actu
 
 	last_overload = overload;
 
-#if defined (CONFIG_ARCH_BOARD_PX4FMU_V4) || defined (CONFIG_ARCH_BOARD_CRAZYFLIE) || defined (CONFIG_ARCH_BOARD_AEROFC_V1) || defined (CONFIG_ARCH_BOARD_AEROCORE2)
+#if !defined(CONFIG_ARCH_LEDS) && defined(BOARD_HAS_CONTROL_STATUS_LEDS)
 
 	/* this runs at around 20Hz, full cycle is 16 ticks = 10/16Hz */
 	if (actuator_armed->armed) {