diff --git a/stmhal/boards/HYDRABUS/mpconfigboard.h b/stmhal/boards/HYDRABUS/mpconfigboard.h
index 9a3f054520d675c166cf71dc7be6a5fa3776e122..0109930cad67676f59a2b5af1f5cb3e73b1b0a0c 100644
--- a/stmhal/boards/HYDRABUS/mpconfigboard.h
+++ b/stmhal/boards/HYDRABUS/mpconfigboard.h
@@ -37,3 +37,6 @@
 #define MICROPY_HW_SDCARD_DETECT_PIN        (pin_A8)
 #define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
 #define MICROPY_HW_SDCARD_DETECT_PRESENT    (1)
+
+// USB config
+#define MICROPY_HW_USB_OTG_ID_PIN (pin_A10)
diff --git a/stmhal/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h b/stmhal/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h
index 8d15635664834871946224dc66470edc5bb1b5c5..f266732d5c70a514c88b6346439edb2d114dbb74 100644
--- a/stmhal/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h
+++ b/stmhal/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h
@@ -48,7 +48,6 @@
 
 #define STM32F405xx
 #define USE_USB_FS
-#define USE_USB_OTG_ID  0
 
 /* ########################## Module Selection ############################## */
 /**
diff --git a/stmhal/boards/PYBV10/mpconfigboard.h b/stmhal/boards/PYBV10/mpconfigboard.h
index 48c40e9936ec5b36e062bfb8ca251f844e507207..25472ba696b3937ee70087259cc38208673da716 100644
--- a/stmhal/boards/PYBV10/mpconfigboard.h
+++ b/stmhal/boards/PYBV10/mpconfigboard.h
@@ -39,5 +39,6 @@
 #define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
 #define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
 
-// USB VBUS detect pin
+// USB config
 #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+#define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
diff --git a/stmhal/boards/PYBV4/mpconfigboard.h b/stmhal/boards/PYBV4/mpconfigboard.h
index a72da6f5287065ea8c3946b2b1c595764d246661..6663175f7adf07123df4e36b71032f300cb5d4f9 100644
--- a/stmhal/boards/PYBV4/mpconfigboard.h
+++ b/stmhal/boards/PYBV4/mpconfigboard.h
@@ -38,5 +38,6 @@
 #define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
 #define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
 
-// USB VBUS detect pin
+// USB config
 #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+#define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
diff --git a/stmhal/boards/STM32F4DISC/mpconfigboard.h b/stmhal/boards/STM32F4DISC/mpconfigboard.h
index b2ccefda5fccb58d5b974cb5b6902c8906402f09..bf26f641db5ca2e06876d1c58bb81d295325f127 100644
--- a/stmhal/boards/STM32F4DISC/mpconfigboard.h
+++ b/stmhal/boards/STM32F4DISC/mpconfigboard.h
@@ -33,5 +33,6 @@
 #define MICROPY_HW_LED_ON(pin)      (pin->gpio->BSRRL = pin->pin_mask)
 #define MICROPY_HW_LED_OFF(pin)     (pin->gpio->BSRRH = pin->pin_mask)
 
-// USB VBUS detect pin
+// USB config
 #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+#define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
diff --git a/stmhal/usbd_conf.c b/stmhal/usbd_conf.c
index 2ff31c9892faf431c26765cc45ce59d209dc7ad0..eddf1d6264342196fed22dfa222f2cc47cec736f 100644
--- a/stmhal/usbd_conf.c
+++ b/stmhal/usbd_conf.c
@@ -33,10 +33,6 @@
 #include "stm32f4xx_hal.h"
 #include "usbd_core.h"
 
-#if !defined(USE_USB_OTG_ID)
-#define USE_USB_OTG_ID 1
-#endif
-
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 /* Private macro -------------------------------------------------------------*/
@@ -79,7 +75,8 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 #endif
 	
-#if USE_USB_OTG_ID
+#if defined(MICROPY_HW_USB_OTG_ID_PIN)
+    // USB ID pin is always A10
     GPIO_InitStruct.Pin = GPIO_PIN_10;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
     GPIO_InitStruct.Pull = GPIO_PULLUP;