diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp
index 6ebe2f66f..2575b4c4b 100644
--- a/radio/src/gui/menus.cpp
+++ b/radio/src/gui/menus.cpp
@@ -1438,9 +1438,6 @@ bool isSourceAvailable(int source)
 
 bool isTelemetrySourceAvailable(int source)
 {
-  if (source == TELEM_RX_VOLTAGE || source == TELEM_A3 || source == TELEM_A4 || source == TELEM_MIN_A3 || source == TELEM_MIN_A4)
-    return false;
-
 #if defined(PCBTARANIS)
   if (source == TELEM_RSSI_TX)
     return false;
diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index d019b5353..38bcc643c 100755
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -333,7 +333,7 @@ getvalue_t getValue(uint8_t i)
 #endif
   else if (i==MIXSRC_FIRST_TELEM-1+TELEM_RSSI_TX) return frskyData.rssi[1].value;
   else if (i==MIXSRC_FIRST_TELEM-1+TELEM_RSSI_RX) return frskyData.rssi[0].value;
-  else if (i<=MIXSRC_FIRST_TELEM-1+TELEM_A2) return frskyData.analog[i-MIXSRC_FIRST_TELEM+1-TELEM_A1].value;
+  else if (i<=MIXSRC_FIRST_TELEM-1+TELEM_A_LAST) return frskyData.analog[i-MIXSRC_FIRST_TELEM+1-TELEM_A1].value;
 #if defined(FRSKY_SPORT)
   else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ALT) return frskyData.hub.baroAltitude;
 #elif defined(FRSKY_HUB) || defined(WS_HOW_HIGH)
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 17d7db539..5165e5f0b 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -1006,6 +1006,12 @@ PACK(typedef struct t_FrSkyChannelData {
 }) FrSkyChannelData;
 #endif
 
+#if defined(CPUARM)
+  #define TELEM_A_COUNT 4
+#else
+  #define TELEM_A_COUNT 2
+#endif
+
 enum TelemetrySource {
   TELEM_NONE,
   TELEM_TX_VOLTAGE,
@@ -1027,12 +1033,14 @@ enum TelemetrySource {
 #if defined(CPUARM)
   TELEM_RX_VOLTAGE,
 #endif
-  TELEM_A1,
+  TELEM_A_FIRST,
+  TELEM_A1=TELEM_A_FIRST,
   TELEM_A2,
 #if defined(CPUARM)
   TELEM_A3,
   TELEM_A4,
 #endif
+  TELEM_A_LAST=TELEM_A_FIRST+TELEM_A_COUNT-1,
   TELEM_ALT,
   TELEM_RPM,
   TELEM_FUEL,
diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h
index aeab32fc2..90070e8be 100644
--- a/radio/src/telemetry/frsky.h
+++ b/radio/src/telemetry/frsky.h
@@ -282,7 +282,7 @@ PACK(struct FrskySerialData {
 #endif
 
 struct FrskyData {
-  FrskyValueWithMinMax analog[2];
+  FrskyValueWithMinMax analog[TELEM_A_COUNT];
   FrskyValueWithMin    rssi[2];
 #if defined(CPUARM)
   FrskyValueWithMin    swr;