diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index bb2dc30ce..d2103e5ba 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -1067,7 +1067,6 @@ enum Capability {
  FlightModesName,
  FlightModesHaveFades,
  Mixes,
- MixesWithoutExpo,
  Timers,
  TimeDivisions,
  CustomFunctions,
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 55cd885d3..8d6d587a9 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -586,14 +586,14 @@ int OpenTxFirmware::getCapability(const Capability capability)
       return 1;
     case DSM2Indexes:
       return 1;
-    case MixesWithoutExpo:
-      return 1;
     case NumCurves:
       return (IS_TARANIS(board) ? 32 : (IS_ARM(board) ? 16 : 8));
     case HasMixerNames:
       return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : false);
     case HasExpoNames:
       return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : false);
+    case HasNoExpo:
+      return (IS_TARANIS(board) ? false : true);
     case ChannelsName:
       return (IS_TARANIS(board) ? 6 : 0);
     case HasCvNames:
diff --git a/companion/src/modeledit/mixerdialog.cpp b/companion/src/modeledit/mixerdialog.cpp
index a49548af8..33140c8df 100644
--- a/companion/src/modeledit/mixerdialog.cpp
+++ b/companion/src/modeledit/mixerdialog.cpp
@@ -143,7 +143,7 @@ void MixerDialog::valuesChanged()
     lock = true;
     QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
     md->srcRaw  = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt(), &model);
-    if (!firmware->getCapability(VirtualInputs) && firmware->getCapability(MixesWithoutExpo)) {
+    if (firmware->getCapability(HasNoExpo)) {
       bool drVisible = (md->srcRaw.type == SOURCE_TYPE_STICK && md->srcRaw.index < NUM_STICKS);
       ui->MixDR_CB->setEnabled(drVisible);
       ui->label_MixDR->setEnabled(drVisible);