diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 6848ab22a..0877a2162 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -1067,7 +1067,16 @@ GeneralSettings::GeneralSettings()
   }
   
   BoardEnum board = GetEepromInterface()->getBoard();
-  if (IS_TARANIS(board)) {
+  if (board == BOARD_HORUS) {
+    potConfig[0] = POT_WITH_DETENT;
+    potConfig[1] = POT_MULTIPOS_SWITCH;
+    potConfig[2] = POT_WITH_DETENT;
+    sliderConfig[0] = SLIDER_WITH_DETENT;
+    sliderConfig[1] = SLIDER_WITH_DETENT;
+    sliderConfig[2] = SLIDER_WITH_DETENT;
+    sliderConfig[3] = SLIDER_WITH_DETENT;
+  }
+  else if (IS_TARANIS(board)) {
     potConfig[0] = POT_WITH_DETENT;
     potConfig[1] = POT_WITH_DETENT;
     sliderConfig[0] = SLIDER_WITH_DETENT;
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 5419e9922..4d05121c1 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -3675,7 +3675,12 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
         internalField.Append(new UnsignedField<8>(generalData.hw_uartMode));
       }
       if (IS_HORUS(board)) {
-        internalField.Append(new SpareBitsField<32>()); // switchConfig
+        for (int i=0; i<16; i++) {
+          if (i < MAX_SWITCHES(board, version))
+            internalField.Append(new UnsignedField<2>(generalData.switchConfig[i]));
+          else
+            internalField.Append(new SpareBitsField<2>());
+        }
       }
       for (int i=0; i<4; i++) {
         if (i < MAX_POTS(board, version))
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 49ae22330..422d6decc 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -598,7 +598,7 @@ int OpenTxFirmware::getCapability(Capability capability)
         return 18;
       else if (board == BOARD_TARANIS_X7)
         return 6;
-      else if (IS_TARANIS(board))
+      else if (IS_TARANIS(board) || board == BOARD_HORUS)
         return 8;
       else
         return 7;