diff --git a/radio/src/storage/conversions/datastructs_218.h b/radio/src/storage/conversions/datastructs_218.h
index 40249ec08..62515cab9 100644
--- a/radio/src/storage/conversions/datastructs_218.h
+++ b/radio/src/storage/conversions/datastructs_218.h
@@ -532,10 +532,16 @@ PACK(struct ModelData_v218 {
   #define THEME_DATA
 #endif
 
+#if defined(PCBHORUS)
+  #define NUM_CALIBRATION_INPUTS  13
+#else
+  #define NUM_CALIBRATION_INPUTS  (NUM_STICKS+STORAGE_NUM_POTS+STORAGE_NUM_SLIDERS)
+#endif
+
 PACK(struct RadioData_v218 {
   uint8_t version;
   uint16_t variant;
-  CalibData calib[NUM_STICKS+STORAGE_NUM_POTS+STORAGE_NUM_SLIDERS+STORAGE_NUM_MOUSE_ANALOGS];
+  CalibData calib[NUM_CALIBRATION_INPUTS];
   uint16_t chkSum;
   N_HORUS_FIELD(int8_t currModel);
   N_HORUS_FIELD(uint8_t contrast);
diff --git a/radio/src/tests/conversions.cpp b/radio/src/tests/conversions.cpp
index 9d2fab4d2..f2a044a9c 100644
--- a/radio/src/tests/conversions.cpp
+++ b/radio/src/tests/conversions.cpp
@@ -102,7 +102,7 @@ TEST(X10Conversions, ConversionRadioFrom22)
   simuFatfsSetPaths(TESTS_PATH "/tests/", TESTS_PATH "/tests/");
   loadRadioSettings("/radio_22_x10.bin");
 
-  EXPECT_EQ(218, g_eeGeneral.version);
+  EXPECT_EQ(219, g_eeGeneral.version);
   EXPECT_STRNEQ("en", g_eeGeneral.ttsLanguage);
   EXPECT_STRNEQ("model1.bin", g_eeGeneral.currModelFilename);
 }