diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 19778020d9..17b9532646 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -301,6 +301,8 @@ void DebugMon_Handler(void) {
 /*  file (startup_stm32f4xx.s).                                               */
 /******************************************************************************/
 
+#if MICROPY_HW_STM_USB_STACK || MICROPY_HW_TINYUSB_STACK
+
 #if defined(STM32G0)
 
 #if MICROPY_HW_USB_FS
@@ -499,6 +501,8 @@ void OTG_HS_WKUP_IRQHandler(void) {
 
 #endif // !defined(STM32L0)
 
+#endif // MICROPY_HW_STM_USB_STACK || MICROPY_HW_TINYUSB_STACK
+
 /**
   * @brief  This function handles PPP interrupt request.
   * @param  None
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index e5ac9311d1..46d7985253 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -36,7 +36,7 @@
 #include "irq.h"
 #include "usb.h"
 
-#if MICROPY_HW_USB_FS || MICROPY_HW_USB_HS
+#if MICROPY_HW_STM_USB_STACK || MICROPY_HW_TINYUSB_STACK
 
 #if BUILDING_MBOOT
 // TinyUSB not used in mboot