diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index 1d856b6f7..57e416f6e 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -554,7 +554,7 @@ bool isPxx2IsrmChannelsCountAllowed(int channels)
 bool isTrainerUsingModuleBay()
 {
 #if defined(PCBTARANIS)
-  if (TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE <= g_model.trainerData.mode && g_model.trainerData.mode <= TRAINER_MODE_MASTER_BATTERY_COMPARTMENT)
+  if (TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE <= g_model.trainerData.mode && g_model.trainerData.mode <= TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE)
     return true;
 #endif
   return false;
diff --git a/radio/src/trainer.cpp b/radio/src/trainer.cpp
index 893d42b67..c4c3c0c4f 100644
--- a/radio/src/trainer.cpp
+++ b/radio/src/trainer.cpp
@@ -26,8 +26,8 @@ uint8_t currentTrainerMode = 0xff;
 
 void checkTrainerSignalWarning()
 {
-  enum PpmInValidState_t {
-    PPM_IN_IS_NOT_USED=0,
+  enum {
+    PPM_IN_IS_NOT_USED = 0,
     PPM_IN_IS_VALID,
     PPM_IN_INVALID
   };
@@ -137,21 +137,20 @@ void checkTrainerSettings()
 #if defined(TRAINER_BATTERY_COMPARTMENT)
       case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
 #if defined(AUX_SERIAL)
-        if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER)
+        if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER) {
           auxSerialSbusInit();
-        else
-          init_trainer_capture();
-        break;
+          break;
+        }
 #endif
+
 #if defined(AUX2_SERIAL)
-        if (g_eeGeneral.aux2SerialMode == UART_MODE_SBUS_TRAINER)
+        if (g_eeGeneral.aux2SerialMode == UART_MODE_SBUS_TRAINER) {
           aux2SerialSbusInit();
-        else
-          init_trainer_capture();
-        break;
+          break;
+        }
 #endif
-        init_trainer_capture();
-        break;
+
+        // no break
 #endif
 
       case TRAINER_MODE_MASTER_TRAINER_JACK: