diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c
index 1abe7253c..b2b7d6138 100644
--- a/src/main/interface/settings.c
+++ b/src/main/interface/settings.c
@@ -816,6 +816,7 @@ const clivalue_t valueTable[] = {
     { "osd_alt_alarm",              VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, 10000 }, PG_OSD_CONFIG, offsetof(osdConfig_t, alt_alarm) },
     { "osd_esc_temp_alarm",         VAR_INT8   | MASTER_VALUE, .config.minmax = { INT8_MIN, INT8_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, esc_temp_alarm) },
     { "osd_esc_rpm_alarm",          VAR_INT16  | MASTER_VALUE, .config.minmax = { ESC_RPM_ALARM_OFF, INT16_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, esc_rpm_alarm) },
+    { "osd_esc_current_alarm",      VAR_INT8   | MASTER_VALUE, .config.minmax = { INT8_MIN, INT8_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, esc_current_alarm) },
 
     { "osd_ah_max_pit",             VAR_UINT8  | MASTER_VALUE, .config.minmax = { 0, 90 }, PG_OSD_CONFIG, offsetof(osdConfig_t, ahMaxPitch) },
     { "osd_ah_max_rol",             VAR_UINT8  | MASTER_VALUE, .config.minmax = { 0, 90 }, PG_OSD_CONFIG, offsetof(osdConfig_t, ahMaxRoll) },
diff --git a/src/main/io/osd.c b/src/main/io/osd.c
index d97a23ab5..56100b27e 100644
--- a/src/main/io/osd.c
+++ b/src/main/io/osd.c
@@ -640,6 +640,57 @@ static bool osdDrawSingleElement(uint8_t item)
                 break;
             }
 
+#ifdef USE_ESC_SENSOR
+            // Show warning if we lose motor output, the ESC is overheating or excessive current draw
+            if (feature(FEATURE_ESC_SENSOR) && enabledWarnings & OSD_WARNING_ESC_FAIL) {
+                char escWarningMsg[OSD_FORMAT_MESSAGE_BUFFER_SIZE];
+                unsigned pos = 0;
+                
+                const char *title = "ESC";
+
+                // center justify message
+                while (pos < (OSD_WARNINGS_MAX_SIZE - (strlen(title) + getMotorCount())) / 2) {
+                    escWarningMsg[pos++] = ' ';
+                }
+
+                strcpy(escWarningMsg + pos, title);
+                pos += strlen(title);
+
+                unsigned i = 0;
+                unsigned escWarningCount = 0;
+                while (i < getMotorCount() && pos < OSD_FORMAT_MESSAGE_BUFFER_SIZE - 1) {
+                    escSensorData_t *escData = getEscSensorData(i);
+                    const char motorNumber = '1' + i;
+                    // if everything is OK just display motor number else R, T or C
+                    char warnFlag = motorNumber;
+                    if (ARMING_FLAG(ARMED) && osdConfig()->esc_rpm_alarm != ESC_RPM_ALARM_OFF && escData->rpm <= osdConfig()->esc_rpm_alarm) {
+                        warnFlag = 'R';
+                    }
+                    if (osdConfig()->esc_temp_alarm != ESC_TEMP_ALARM_OFF && escData->temperature >= osdConfig()->esc_temp_alarm) {
+                        warnFlag = 'T';
+                    }
+                    if (ARMING_FLAG(ARMED) && osdConfig()->esc_current_alarm != ESC_CURRENT_ALARM_OFF && escData->current >= osdConfig()->esc_current_alarm) {
+                        warnFlag = 'C';
+                    }
+
+                    escWarningMsg[pos++] = warnFlag;
+
+                    if (warnFlag != motorNumber) {
+                        escWarningCount++;
+                    }
+
+                    i++;
+                }
+
+                escWarningMsg[pos] = '\0';
+
+                if (escWarningCount > 0) {
+                    osdFormatMessage(buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, escWarningMsg);
+                }
+                break;
+            }
+#endif
+
             // Warn when in flip over after crash mode
             if ((enabledWarnings & OSD_WARNING_CRASH_FLIP)
                   && (isFlipOverAfterCrashMode())) {
@@ -671,40 +722,6 @@ static bool osdDrawSingleElement(uint8_t item)
                 break;
             }
 
-#ifdef USE_ESC_SENSOR
-            // Show warning if we lose motor output or the ESC is overheating
-            if (feature(FEATURE_ESC_SENSOR) && enabledWarnings & OSD_WARNING_ESC_FAIL) {
-                char escErrMsg[OSD_FORMAT_MESSAGE_BUFFER_SIZE];
-                unsigned pos = 0;
-                
-                const char *title = "ESC";
-
-                // center justify message
-                while (pos < (OSD_WARNINGS_MAX_SIZE - (strlen(title) + getMotorCount())) / 2) {
-                    escErrMsg[pos++] = ' ';
-                }
-
-                strcpy(escErrMsg + pos, title);
-                pos += strlen(title);
-
-                unsigned i = 0;
-                while (i < getMotorCount() && pos < OSD_FORMAT_MESSAGE_BUFFER_SIZE - 1) {
-                    escSensorData_t *escData = getEscSensorData(i);
-                    const bool escWarning = (ARMING_FLAG(ARMED) && osdConfig()->esc_rpm_alarm != ESC_RPM_ALARM_OFF && escData->rpm <= osdConfig()->esc_rpm_alarm) ||
-                        (osdConfig()->esc_temp_alarm != ESC_TEMP_ALARM_OFF && escData->temperature >= osdConfig()->esc_temp_alarm);
-
-                    escErrMsg[pos++] = escWarning ? '1' + i : ' ';
-
-                    i++;
-                }
-
-                escErrMsg[pos] = '\0';
-
-                osdFormatMessage(buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, escErrMsg);
-                break;
-            }
-#endif
-
             // Visual beeper
             if (enabledWarnings & OSD_WARNING_VISUAL_BEEPER && showVisualBeeper) {
                 osdFormatMessage(buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "  * * * *");
diff --git a/src/main/io/osd.h b/src/main/io/osd.h
index 0a7686f15..d6e0598a5 100644
--- a/src/main/io/osd.h
+++ b/src/main/io/osd.h
@@ -143,6 +143,7 @@ typedef enum {
 
 #define ESC_RPM_ALARM_OFF -1
 #define ESC_TEMP_ALARM_OFF INT8_MIN
+#define ESC_CURRENT_ALARM_OFF INT8_MIN
 
 typedef struct osdConfig_s {
     uint16_t item_pos[OSD_ITEM_COUNT];
@@ -162,6 +163,7 @@ typedef struct osdConfig_s {
     bool enabled_stats[OSD_STAT_COUNT];
     int8_t esc_temp_alarm;
     int16_t esc_rpm_alarm;
+    int8_t esc_current_alarm;
 } osdConfig_t;
 
 PG_DECLARE(osdConfig_t, osdConfig);