diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index ad3525c06..2850b3ff4 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -896,6 +896,7 @@ class FrSkyData {
     bool mAhPersistent;
     unsigned int storedMah;
     int fasOffset;
+    unsigned int rxBattAlarms[2];
 
     void clear();
 };
@@ -1016,10 +1017,7 @@ class ModelData {
     uint8_t  bt_telemetry;
     uint8_t  numVoice;
     MavlinkData mavlink;
-    /* FrSky */
     FrSkyData frsky;
-    FrSkyErAlarmData frskyalarms[8];
-    uint8_t customdisplay[6];
 
     char bitmap[10+1];
 
diff --git a/companion/src/firmwares/ersky9x/ersky9xeeprom.cpp b/companion/src/firmwares/ersky9x/ersky9xeeprom.cpp
index 6204f8ede..8a215ce9b 100644
--- a/companion/src/firmwares/ersky9x/ersky9xeeprom.cpp
+++ b/companion/src/firmwares/ersky9x/ersky9xeeprom.cpp
@@ -722,14 +722,14 @@ t_Ersky9xModelData_v11::operator ModelData ()
   c9x.frsky.usrProto=FrSkyUsrProto;
   c9x.frsky.imperial=FrSkyImperial;
   c9x.frsky.FrSkyGpsAlt=FrSkyGpsAlt;
-  for (int i=0; i<8; i++) {
-    c9x.frskyalarms[i].frskyAlarmLimit=frskyAlarms.alarmData[i].frskyAlarmLimit;
-    c9x.frskyalarms[i].frskyAlarmSound=frskyAlarms.alarmData[i].frskyAlarmSound;
-    c9x.frskyalarms[i].frskyAlarmType=frskyAlarms.alarmData[i].frskyAlarmType;
-  }
-  for (int i=0; i<8; i++) {
-    c9x.customdisplay[i]=customDisplayIndex[i];
-  }
+  // for (int i=0; i<8; i++) {
+  //   c9x.frskyalarms[i].frskyAlarmLimit=frskyAlarms.alarmData[i].frskyAlarmLimit;
+  //   c9x.frskyalarms[i].frskyAlarmSound=frskyAlarms.alarmData[i].frskyAlarmSound;
+  //   c9x.frskyalarms[i].frskyAlarmType=frskyAlarms.alarmData[i].frskyAlarmType;
+  // }
+  // for (int i=0; i<8; i++) {
+  //   c9x.customdisplay[i]=customDisplayIndex[i];
+  // }
   for (int i=0; i<5;i++) {
     c9x.phaseData[0].gvars[i]=gvars[i].gvar;
     c9x.gvsource[i]=gvars[i].gvsource;
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 641bdeab4..45e5d2014 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -2560,6 +2560,11 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
       internalField.Append(new SignedField<8>(modelData.potPosition[i]));
     }    
   }
+
+  if (IS_ARM(board) && version >= 216) {
+    internalField.Append(new UnsignedField<8>(modelData.frsky.rxBattAlarms[0]));
+    internalField.Append(new UnsignedField<8>(modelData.frsky.rxBattAlarms[1]));
+  }
 }
 
 void OpenTxModelData::beforeExport()