diff --git a/os/hal/platforms/STM32/icu_lld.c b/os/hal/platforms/STM32/icu_lld.c
index 2aa067d1a..37390253c 100644
--- a/os/hal/platforms/STM32/icu_lld.c
+++ b/os/hal/platforms/STM32/icu_lld.c
@@ -276,7 +276,7 @@ void icu_lld_init(void) {
 #if STM32_ICU_USE_TIM8
   /* Driver initialization.*/
   icuObjectInit(&ICUD8);
-  ICUD5.tim = STM32_TIM8;
+  ICUD8.tim = STM32_TIM8;
 #endif
 }
 
@@ -340,8 +340,8 @@ void icu_lld_start(ICUDriver *icup) {
 #endif
 #if STM32_ICU_USE_TIM8
     if (&ICUD8 == icup) {
-      rccEnableTIM5(FALSE);
-      rccResetTIM5();
+      rccEnableTIM8(FALSE);
+      rccResetTIM8();
       nvicEnableVector(TIM8_CC_IRQn,
                        CORTEX_PRIORITY_MASK(STM32_ICU_TIM8_IRQ_PRIORITY));
       icup->clock = STM32_TIMCLK2;
diff --git a/readme.txt b/readme.txt
index 79decada4..a178f5f6f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -79,6 +79,8 @@
 *****************************************************************************
 
 *** 2.4.1 ***
+- FIX: Fixed STM32 ICUD8 not functional because wrong initialization (bug
+  3508758).
 - FIX: Fixed chMBFetchI does not decrement mb_fullsem (bug 3504450).
 - FIX: Fixed USART3 not working on STM32F2/F4 UART driver (bug 3496981).
 - FIX: Fixed stack misalignment on Posix-MacOSX (bug 3495487).