diff --git a/src/system.cpp b/src/system.cpp
index 42a4719a4..615466864 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -510,10 +510,10 @@ void System::measure_analog() {
 
     if (!measure_last_ || (uint32_t)(uuid::get_uptime() - measure_last_) >= SYSTEM_MEASURE_ANALOG_INTERVAL) {
         measure_last_ = uuid::get_uptime();
-#if defined(ESP32)
-        uint16_t a = analogRead(ADC_CH0_GPIO);
+#if defined(EMSESP_STANDALONE)
+        uint16_t a = 0;
 #else
-        uint16_t a = 0; // standalone
+        uint16_t a = analogReadMilliVolts(ADC1_CHANNEL_0_GPIO_NUM);
 #endif
         static uint32_t sum_ = 0;
 
diff --git a/src/system.h b/src/system.h
index 74cce4a7e..4e41a8cab 100644
--- a/src/system.h
+++ b/src/system.h
@@ -143,7 +143,6 @@ class System {
     static constexpr uint32_t SYSTEM_HEARTBEAT_INTERVAL      = 60000; // in milliseconds, how often the MQTT heartbeat is sent (1 min)
     static constexpr uint32_t SYSTEM_MEASURE_ANALOG_INTERVAL = 500;
     static constexpr uint8_t  LED_ON                         = HIGH; // LED
-    static constexpr uint8_t  ADC_CH0_GPIO                   = 36;
 
 #ifndef EMSESP_STANDALONE
     static uuid::syslog::SyslogService syslog_;