diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index ed13efde5..907f75076 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -835,6 +835,7 @@ class ModuleData {
     ModuleData() { clear(); }
     unsigned int modelId;
     int          protocol;
+    int          subprotocol;
     unsigned int channelsStart;
     int          channelsCount; // 0=8 channels
     unsigned int failsafeMode;
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 530d744a3..a963f47f5 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -584,7 +584,6 @@ class SourceField: public ConversionField< UnsignedField<N> > {
 
     virtual void beforeExport()
     {
-      if (source.type == SOURCE_TYPE_TELEMETRY) qDebug() << source.type << source.index;
       _source = source.toValue();
       ConversionField< UnsignedField<N> >::beforeExport();
     }
@@ -3225,6 +3224,10 @@ void OpenTxModelData::afterImport()
     }
   }
 
+  if (IS_TARANIS(board) && modelData.moduleData[0].protocol == 0) {
+    modelData.moduleData[0].protocol = PXX_XJT_X16;
+  }
+
   for (int module=0; module<3; module++) {
     if (modelData.moduleData[module].protocol == PXX_XJT_X16 || modelData.moduleData[module].protocol == LP45) {
       if (subprotocols[module] >= 0)