diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 915acc187..d06684e4f 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -2978,9 +2978,13 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
       internalField.Append(new SignedField<8>(subprotocols[module]));
       internalField.Append(new UnsignedField<8>(modelData.moduleData[module].channelsStart));
       internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[module].channelsCount, -8));
-      internalField.Append(new UnsignedField<8>(modelData.moduleData[module].failsafeMode));
-      for (int i=0; i<32; i++)
+      if (version >= 217)
+        internalField.Append(new UnsignedField<8>(modelData.moduleData[module].failsafeMode));
+      else
+        internalField.Append(new ConversionField< UnsignedField<8> >(modelData.moduleData[module].failsafeMode, 1));
+      for (int i=0; i<32; i++) {
         internalField.Append(new SignedField<16>(modelData.moduleData[module].failsafeChannels[i]));
+      }
       internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[module].ppmDelay, exportPpmDelay, importPpmDelay));
       internalField.Append(new SignedField<8>(modelData.moduleData[module].ppmFrameLength));
       if (IS_9XRPRO(board)) {
diff --git a/companion/src/modeledit/setup_module.ui b/companion/src/modeledit/setup_module.ui
index d764103d8..df8e420e0 100644
--- a/companion/src/modeledit/setup_module.ui
+++ b/companion/src/modeledit/setup_module.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>737</width>
+    <width>757</width>
     <height>300</height>
    </rect>
   </property>
@@ -67,12 +67,12 @@
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <layout class="QGridLayout" name="gridLayout_69" rowstretch="0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0,0,0">
-      <property name="margin">
-       <number>0</number>
-      </property>
       <property name="verticalSpacing">
        <number>6</number>
       </property>
+      <property name="margin">
+       <number>0</number>
+      </property>
       <item row="2" column="3" alignment="Qt::AlignLeft">
        <widget class="QSpinBox" name="channelsStart">
         <property name="maximumSize">
@@ -418,6 +418,11 @@
           <height>16777215</height>
          </size>
         </property>
+        <item>
+         <property name="text">
+          <string>Not set</string>
+         </property>
+        </item>
         <item>
          <property name="text">
           <string>Hold</string>