diff --git a/libraries/AP_Notify/AP_Notify.cpp b/libraries/AP_Notify/AP_Notify.cpp
index 8759b2330a..9c1d93a749 100644
--- a/libraries/AP_Notify/AP_Notify.cpp
+++ b/libraries/AP_Notify/AP_Notify.cpp
@@ -89,32 +89,6 @@ AP_Notify *AP_Notify::_singleton;
 #define DRONECAN_LEDS 0
 #endif
 
-#ifndef DEFAULT_NTF_LED_TYPES
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-  #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO
-    #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board | I2C_LEDS |\
-                                    Notify_LED_PCA9685LED_I2C_External)
-
-  #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_EDGE
-    #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board | I2C_LEDS |\
-                                    DRONECAN_LEDS)
-  #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI || \
-        CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BLUE || \
-        CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_POCKET || \
-        CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBRAIN2 || \
-        CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXFMINI || \
-        CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BH || \
-        CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO || \
-        CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_OBAL_V1 || \
-        CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_CANZERO
-    #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board)
-
-  #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RST_ZYNQ
-    #define DEFAULT_NTF_LED_TYPES (Notify_LED_ToshibaLED_I2C_External)
-  #endif  // board subtype
-#endif  // CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-#endif  // defined (DEFAULT_NTF_LED_TYPES)
-
 #ifndef DEFAULT_NTF_LED_TYPES
     #if HAL_WITH_IO_MCU && AP_IOMCU_PROFILED_SUPPORT_ENABLED
       #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board | Notify_LED_ProfiLED_IOMCU | I2C_LEDS)
@@ -418,43 +392,19 @@ void AP_Notify::add_backends(void)
     ADD_BACKEND(NEW_NOTHROW Display());
 #endif
 
-// ChibiOS noise makers
-#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
+// Noise makers:
+#if AP_NOTIFY_BUZZER_ENABLED
     ADD_BACKEND(NEW_NOTHROW Buzzer());
-
-// ESP32 noise makers
-#elif CONFIG_HAL_BOARD == HAL_BOARD_ESP32
-    ADD_BACKEND(NEW_NOTHROW Buzzer());
-
-// Linux noise makers
-#elif CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-  #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO || \
-      CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO2 || \
-      CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_EDGE || \
-      CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBRAIN2 || \
-      CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXFMINI || \
-      CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RST_ZYNQ || \
-      CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BLUE || \
-      CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_CANZERO
-    // No noise makers, keep this though to ensure that the final else is safe
-
-  #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI || \
-        CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_POCKET || \
-        CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_OBAL_V1
-    ADD_BACKEND(NEW_NOTHROW Buzzer());
-  #endif
-
-#elif CONFIG_HAL_BOARD == HAL_BOARD_SITL
-    ADD_BACKEND(NEW_NOTHROW Buzzer());
-#ifdef WITH_SITL_RGBLED
-    ADD_BACKEND(NEW_NOTHROW SITL_SFML_LED());
 #endif
-#endif // Noise makers
 
 #if AP_NOTIFY_TONEALARM_ENABLED
     ADD_BACKEND(NEW_NOTHROW AP_ToneAlarm());
 #endif
 
+
+#ifdef WITH_SITL_RGBLED
+    ADD_BACKEND(NEW_NOTHROW SITL_SFML_LED());
+#endif
 }
 
 // initialisation
diff --git a/libraries/AP_Notify/AP_Notify_config.h b/libraries/AP_Notify/AP_Notify_config.h
index 4ac9425def..882f45fbc8 100644
--- a/libraries/AP_Notify/AP_Notify_config.h
+++ b/libraries/AP_Notify/AP_Notify_config.h
@@ -131,3 +131,7 @@
 #ifndef AP_NOTIFY_TONEALARM_ENABLED
 #define AP_NOTIFY_TONEALARM_ENABLED 0
 #endif
+
+#ifndef AP_NOTIFY_BUZZER_ENABLED
+#define AP_NOTIFY_BUZZER_ENABLED 0
+#endif