diff --git a/hal/explicit_pinmap.h b/hal/explicit_pinmap.h
index ce61a919ab..83d0d88ed9 100644
--- a/hal/explicit_pinmap.h
+++ b/hal/explicit_pinmap.h
@@ -52,6 +52,15 @@ MSTD_CONSTEXPR_FN_14 PinMap get_analogin_pinmap(const PinName pin)
             return {pin, pinmap.peripheral, pinmap.function};
         }
     }
+
+#if PINMAP_ANALOGIN_INTERNAL
+    for (const PinMap &pinmap : PINMAP_ANALOGIN_INTERNAL) {
+        if (pinmap.pin == pin) {
+            return {pin, pinmap.peripheral, pinmap.function};
+        }
+    }
+#endif
+
     return {NC, (int) NC, (int) NC};
 }
 #endif // DEVICE_ANALOGIN
diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303RE/PeripheralPinMaps.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303RE/PeripheralPinMaps.h
index 5192ce1a39..9e059aac7a 100644
--- a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303RE/PeripheralPinMaps.h
+++ b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303RE/PeripheralPinMaps.h
@@ -331,6 +331,7 @@ MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_USB_FS[] = {
 };
 
 #define PINMAP_ANALOGIN PinMap_ADC
+#define PINMAP_ANALOGIN_INTERNAL PinMap_ADC_Internal
 #define PINMAP_ANALOGOUT PinMap_DAC
 #define PINMAP_I2C_SDA PinMap_I2C_SDA
 #define PINMAP_I2C_SCL PinMap_I2C_SCL
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F411xE/TARGET_NUCLEO_F411RE/PeripheralPinMaps.h b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F411xE/TARGET_NUCLEO_F411RE/PeripheralPinMaps.h
index dcfe5f223a..4acd40c5cf 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F411xE/TARGET_NUCLEO_F411RE/PeripheralPinMaps.h
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F411xE/TARGET_NUCLEO_F411RE/PeripheralPinMaps.h
@@ -247,6 +247,7 @@ MSTD_CONSTEXPR_OBJ_11 const PinMap PinMap_USB_FS[] = {
 };
 
 #define PINMAP_ANALOGIN PinMap_ADC
+#define PINMAP_ANALOGIN_INTERNAL PinMap_ADC_Internal
 #define PINMAP_I2C_SDA PinMap_I2C_SDA
 #define PINMAP_I2C_SCL PinMap_I2C_SCL
 #define PINMAP_UART_TX PinMap_UART_TX
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/TARGET_NUCLEO_F429ZI/PeripheralPinMaps.h b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/TARGET_NUCLEO_F429ZI/PeripheralPinMaps.h
index f636a114e8..4b37d0637d 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/TARGET_NUCLEO_F429ZI/PeripheralPinMaps.h
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/TARGET_NUCLEO_F429ZI/PeripheralPinMaps.h
@@ -400,6 +400,7 @@ MSTD_CONSTEXPR_OBJ_11 const PinMap PinMap_USB_HS[] = {
 };
 
 #define PINMAP_ANALOGIN PinMap_ADC
+#define PINMAP_ANALOGIN_INTERNAL PinMap_ADC_Internal
 #define PINMAP_ANALOGOUT PinMap_DAC
 #define PINMAP_I2C_SDA PinMap_I2C_SDA
 #define PINMAP_I2C_SCL PinMap_I2C_SCL
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralPinMaps.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralPinMaps.h
index 39f520af5c..b7c66323ef 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralPinMaps.h
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralPinMaps.h
@@ -394,6 +394,7 @@ MSTD_CONSTEXPR_OBJ_11 const PinMap PinMap_USB_FS[] = {
 };
 
 #define PINMAP_ANALOGIN PinMap_ADC
+#define PINMAP_ANALOGIN_INTERNAL PinMap_ADC_Internal
 #define PINMAP_ANALOGOUT PinMap_DAC
 #define PINMAP_I2C_SDA PinMap_I2C_SDA
 #define PINMAP_I2C_SCL PinMap_I2C_SCL