diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index 03f09e184..8c742f141 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -281,12 +281,14 @@ if(TRACE_AUDIO)
 endif()
 
 if(DEBUG STREQUAL RTT)
+  set(DEBUG ON)
   set(DEBUG_SEGGER_RTT ON)
   add_definitions(-DDEBUG_SEGGER_RTT)
   set(SRC ${SRC} ${THIRDPARTY_DIR}/Segger_RTT/RTT/SEGGER_RTT.c)
 endif()
 
 if(DEBUG STREQUAL RTT_NO_USB)
+  set(DEBUG ON)
   set(DEBUG_SEGGER_RTT ON)
   add_definitions(-DDEBUG_SEGGER_RTT)
   add_definitions(-DDEBUG_DISABLE_USB)
diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp
index 838a19159..61e96903e 100644
--- a/radio/src/targets/horus/board.cpp
+++ b/radio/src/targets/horus/board.cpp
@@ -127,13 +127,18 @@ void boardInit()
   board_set_bor_level();
 #endif
 
-#if defined(FUNCTION_SWITCHES) && !defined(DEBUG_DISABLE_USB)
+#if defined(FUNCTION_SWITCHES) && !defined(DEBUG)
   // This is needed to prevent radio from starting when usb is plugged to charge
   usbInit();
   // prime debounce state...
    usbPlugged();
    if (usbPlugged()) {
      delaysInit();
+ #if defined(AUDIO_MUTE_GPIO)
+     // Charging can make a buzzing noise
+     gpio_init(AUDIO_MUTE_GPIO, GPIO_OUT, GPIO_PIN_SPEED_LOW);
+     gpio_set(AUDIO_MUTE_GPIO);
+ #endif
      while (usbPlugged()) {
        delay_ms(1000);
      }
diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp
index 8d9d37ea1..63ac0d9c2 100644
--- a/radio/src/targets/taranis/board.cpp
+++ b/radio/src/targets/taranis/board.cpp
@@ -114,13 +114,18 @@ void boardInit()
   LL_APB1_GRP1_EnableClock(AUDIO_RCC_APB1Periph);
   LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_SYSCFG);
 
-#if defined(USB_CHARGE_LED) && !defined(DEBUG_DISABLE_USB)
+#if defined(USB_CHARGE_LED) && !defined(DEBUG)
   usbInit();
   // prime debounce state...
   usbPlugged();
 
   if (usbPlugged()) {
     delaysInit();
+#if defined(AUDIO_MUTE_GPIO)
+     // Charging can make a buzzing noise
+     gpio_init(AUDIO_MUTE_GPIO, GPIO_OUT, GPIO_PIN_SPEED_LOW);
+     gpio_set(AUDIO_MUTE_GPIO);
+ #endif
     while (usbPlugged()) {
       delay_ms(1000);
     }