diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 2881e5801..61ff602bb 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -214,10 +214,9 @@ enum TelemetrySource {
   TELEMETRY_SOURCE_POWER_MAX,
   TELEMETRY_SOURCE_ACC,
   TELEMETRY_SOURCE_GPS_TIME,
-  TELEMETRY_SOURCES_STATUS_COUNT,
-  TELEMETRY_SOURCES_DISPLAY_COUNT = TELEMETRY_SOURCES_STATUS_COUNT-2,
-
-  TELEMETRY_SOURCES_COUNT = TELEMETRY_SOURCE_VERTICAL_SPEED,
+  TELEMETRY_SOURCES_STATUS_COUNT = TELEMETRY_SOURCE_GPS_TIME+1,
+  TELEMETRY_SOURCES_DISPLAY_COUNT = TELEMETRY_SOURCE_POWER_MAX+1,
+  TELEMETRY_SOURCES_COUNT = TELEMETRY_SOURCE_DTE+1,
 };
 
 #define TM_HASTELEMETRY     0x01
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index c17bdb1b1..4fd070430 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -101,7 +101,7 @@ void populateCustomScreenFieldCB(QComboBox *b, unsigned int value, bool last=fal
 
   b->addItem(RawSource(SOURCE_TYPE_NONE, 0).toString());
 
-  for (unsigned int i = 0; i < (last ? TELEMETRY_SOURCES_DISPLAY_COUNT : TELEMETRY_SOURCES_STATUS_COUNT); i++) {
+  for (unsigned int i = 0; i <= (last ? TELEMETRY_SOURCES_DISPLAY_COUNT : TELEMETRY_SOURCES_STATUS_COUNT); i++) {
     b->addItem(RawSource(SOURCE_TYPE_TELEMETRY, i).toString());
     if (!(i>=sizeof(telem_hub)/sizeof(int) || telem_hub[i]==0 || ((telem_hub[i]>=hubproto) && hubproto!=0))) {
       QModelIndex index = b->model()->index(i, 0);