diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 4d9d144f7..5335c2fdc 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -565,6 +565,9 @@ void ModulePanel::update()
       default:
         break;
     }
+
+    if (protocol != PULSES_MULTIMODULE && module.hasFailsafes(firmware))
+      mask |= MASK_FAILSAFES;
   }
   else if (IS_HORUS_OR_TARANIS(board)) {
     if (model->trainerMode == TRAINER_MODE_SLAVE_JACK) {
@@ -574,9 +577,6 @@ void ModulePanel::update()
   else if (model->trainerMode != TRAINER_MODE_MASTER_JACK) {
     mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
   }
-  else if (module.hasFailsafes(firmware)) {
-    mask |= MASK_FAILSAFES;
-  }
 
   if (isExternalModule(moduleIdx))
     ui->telemetryBaudrate->setVisible(mask & MASK_BAUDRATE);