diff --git a/companion/src/firmwares/generalsettings.h b/companion/src/firmwares/generalsettings.h
index cf0fd550c..436b684b0 100644
--- a/companion/src/firmwares/generalsettings.h
+++ b/companion/src/firmwares/generalsettings.h
@@ -134,7 +134,6 @@ class GeneralSettings {
     unsigned int mAhWarn;
     unsigned int mAhUsed;
     unsigned int globalTimer;
-    bool bluetoothEnable;
     char bluetoothName[10+1];
     unsigned int bluetoothBaudrate;
     unsigned int bluetoothMode;
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index da02290e3..9df2cf915 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -3836,7 +3836,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
       internalField.Append(new ZCharField<10>(this, generalData.bluetoothName, "Bluetooth name"));
     }
     else if (IS_TARANIS_X9E(board) && version >= 217) {
-      internalField.Append(new BoolField<8>(this, generalData.bluetoothEnable));
+      internalField.Append(new UnsignedField<8>(this, generalData.bluetoothMode));
       internalField.Append(new ZCharField<10>(this, generalData.bluetoothName, "Bluetooth name"));
     }
 
diff --git a/companion/src/generaledit/hardware.cpp b/companion/src/generaledit/hardware.cpp
index 40170ee5a..ed88b2807 100644
--- a/companion/src/generaledit/hardware.cpp
+++ b/companion/src/generaledit/hardware.cpp
@@ -157,8 +157,8 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
     ui->txCurrentCalibrationLabel->hide();
   }
 
-  if (IS_TARANIS_X9E(board) || IS_HORUS(board)) {
-    ui->bluetoothEnable->setChecked(generalSettings.bluetoothEnable);
+  if (IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board)|| IS_TARANIS_X9E(board) || IS_HORUS(board)) {
+    ui->bluetoothMode->setCurrentIndex(generalSettings.bluetoothMode);
     ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
   }
   else {
@@ -238,9 +238,9 @@ void HardwarePanel::on_txCurrentCalibration_editingFinished()
   }
 }
 
-void HardwarePanel::on_bluetoothEnable_stateChanged(int)
+void HardwarePanel::on_bluetoothMode_stateChanged(int index)
 {
-  generalSettings.bluetoothEnable = ui->bluetoothEnable->isChecked();
+  generalSettings.bluetoothMode = index;
   emit modified();
 }
 
diff --git a/companion/src/generaledit/hardware.h b/companion/src/generaledit/hardware.h
index 7d53a6d14..eb1decd50 100644
--- a/companion/src/generaledit/hardware.h
+++ b/companion/src/generaledit/hardware.h
@@ -48,7 +48,7 @@ class HardwarePanel : public GeneralPanel
 
     void on_txCurrentCalibration_editingFinished();
     void on_txVoltageCalibration_editingFinished();
-    void on_bluetoothEnable_stateChanged(int);
+    void on_bluetoothMode_stateChanged(int);
     void on_filterEnable_stateChanged();
 
     void on_serialPortMode_currentIndexChanged(int index);
diff --git a/companion/src/generaledit/hardware.ui b/companion/src/generaledit/hardware.ui
index 72fe4ba15..93356ce78 100644
--- a/companion/src/generaledit/hardware.ui
+++ b/companion/src/generaledit/hardware.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>470</width>
-    <height>1095</height>
+    <height>1419</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -1099,10 +1099,25 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="QCheckBox" name="bluetoothEnable">
-        <property name="text">
+       <widget class="QComboBox" name="bluetoothMode">
+        <property name="text" stdset="0">
          <string/>
         </property>
+        <item>
+         <property name="text">
+          <string>OFF</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Telemetry</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Trainer</string>
+         </property>
+        </item>
        </widget>
       </item>
       <item>