diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 1862e0ed5..73e14bb75 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -307,10 +307,7 @@ QString RawSource::toString()
     case SOURCE_TYPE_PPM:
       return QObject::tr("TR%1").arg(index+1);
     case SOURCE_TYPE_CH:
-      if (index < GetEepromInterface()->getCapability(Outputs))
-        return QObject::tr("CH%1%2").arg((index+1)/10).arg((index+1)%10);
-      else
-        return QObject::tr("X%1").arg(index-GetEepromInterface()->getCapability(Outputs)+1);
+      return QObject::tr("CH%1").arg(index+1);
     case SOURCE_TYPE_TELEMETRY:
       return CHECK_IN_ARRAY(telemetry, index);
     case SOURCE_TYPE_GVAR:
diff --git a/companion/src/modeledit/mixerdialog.cpp b/companion/src/modeledit/mixerdialog.cpp
index b96719dfc..19dbee5f3 100644
--- a/companion/src/modeledit/mixerdialog.cpp
+++ b/companion/src/modeledit/mixerdialog.cpp
@@ -16,10 +16,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
     QLabel * lb_fp[] = {ui->lb_FP0,ui->lb_FP1,ui->lb_FP2,ui->lb_FP3,ui->lb_FP4,ui->lb_FP5,ui->lb_FP6,ui->lb_FP7,ui->lb_FP8 };
     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 };
 
-    if (md->destCh > (unsigned int)GetEepromInterface()->getCapability(Outputs))
-      this->setWindowTitle(tr("DEST -> X%1").arg(md->destCh-GetEepromInterface()->getCapability(Outputs)));
-    else
-      this->setWindowTitle(tr("DEST -> CH%1%2").arg(md->destCh/10).arg(md->destCh%10));
+    this->setWindowTitle(tr("DEST -> CH%1").arg(md->destCh));
 
     populateSourceCB(ui->sourceCB, md->srcRaw, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
     ui->sourceCB->removeItem(0);