diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 483537b649..7363e26e89 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -786,7 +786,7 @@ void TIM8_UP_TIM13_IRQHandler(void) {
     IRQ_EXIT(TIM8_UP_TIM13_IRQn);
 }
 
-#if defined(STM32G4) || defined(STM32L4)
+#if defined(STM32G4) || defined(STM32H5) || defined(STM32L4)
 void TIM8_UP_IRQHandler(void) {
     IRQ_ENTER(TIM8_UP_IRQn);
     timer_irq_handler(8);
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 5319ae4ece..5f2e213a0a 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -884,10 +884,11 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(7, TIM7_IRQn),
     #endif
     #endif
+
     #if defined(TIM8)
     #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
     TIM_ENTRY(8, TIM8_UP_TIM13_IRQn),
-    #elif defined(STM32G4) || defined(STM32L4)
+    #else
     TIM_ENTRY(8, TIM8_UP_IRQn),
     #endif
     #endif