diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c
index c795c18d8f..cb04a8f23f 100644
--- a/src/main/fc/fc_tasks.c
+++ b/src/main/fc/fc_tasks.c
@@ -109,7 +109,7 @@ static void taskHandleSerial(timeUs_t currentTimeUs)
 
 static void taskUpdateBattery(timeUs_t currentTimeUs)
 {
-#ifdef USE_ADC
+#if defined(USE_ADC) || defined(USE_ESC_SENSOR)
     static uint32_t vbatLastServiced = 0;
     if (feature(FEATURE_VBAT) || feature(FEATURE_ESC_SENSOR)) {
         if (cmp32(currentTimeUs, vbatLastServiced) >= VBATINTERVAL) {
diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c
index a240570fce..e9591610a3 100644
--- a/src/main/sensors/battery.c
+++ b/src/main/sensors/battery.c
@@ -295,6 +295,8 @@ void updateCurrentMeter(int32_t lastUpdateAt, rxConfig_t *rxConfig, uint16_t dea
                 updateCurrentDrawn(lastUpdateAt);
             }
             #endif
+
+            break;
         case CURRENT_SENSOR_NONE:
             amperage = 0;