diff --git a/arch/arm/src/stm32l4/stm32l4x6xx_rcc.c b/arch/arm/src/stm32l4/stm32l4x6xx_rcc.c
index 7111a8a184c..8b6823d9b56 100644
--- a/arch/arm/src/stm32l4/stm32l4x6xx_rcc.c
+++ b/arch/arm/src/stm32l4/stm32l4x6xx_rcc.c
@@ -968,6 +968,14 @@ static void stm32l4_stdclockconfig(void)
       stm32l4_rcc_enablelsi();
 #endif
 
+#if defined(STM32L4_BOARD_USEHSI)
+      /* Enable wake-up to HSI from Stop modes */
+
+      regval  = getreg32(STM32L4_RCC_CFGR);
+      regval |= RCC_CFGR_STOPWUCK_HSI;
+      putreg32(regval, STM32L4_RCC_CFGR);
+#endif
+
 #if defined(STM32L4_USE_LSE)
       /* Low speed external clock source LSE
        *