diff --git a/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/mcuconf.h b/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/mcuconf.h
index a795250a6..0bc091a2c 100644
--- a/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/mcuconf.h
+++ b/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/mcuconf.h
@@ -72,6 +72,8 @@
 #define STM32_IRQ_EXTI16_PRIORITY           3
 #define STM32_IRQ_EXTI17_20_PRIORITY        3
 #define STM32_IRQ_EXTI21_22_PRIORITY        3
+#define STM32_IRQ_USART2_PRIORITY           3
+#define STM32_IRQ_LPUART1_PRIORITY          3
 
 /*
  * ADC driver system settings.
@@ -131,9 +133,6 @@
  */
 #define STM32_SERIAL_USE_USART2             TRUE
 #define STM32_SERIAL_USE_LPUART1            FALSE
-#define STM32_SERIAL_USART1_PRIORITY        3
-#define STM32_SERIAL_USART2_PRIORITY        3
-#define STM32_SERIAL_LPUART1_PRIORITY       3
 
 /*
  * SPI driver system settings.
@@ -160,7 +159,6 @@
  * UART driver system settings.
  */
 #define STM32_UART_USE_USART2               FALSE
-#define STM32_UART_USART2_IRQ_PRIORITY      3
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 6)
 #define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 7)
diff --git a/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/mcuconf.h b/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/mcuconf.h
index 4f3bb8b08..07052b9f9 100644
--- a/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/mcuconf.h
@@ -73,6 +73,8 @@
 #define STM32_IRQ_EXTI16_PRIORITY           3
 #define STM32_IRQ_EXTI17_20_PRIORITY        3
 #define STM32_IRQ_EXTI21_22_PRIORITY        3
+#define STM32_IRQ_USART2_PRIORITY           3
+#define STM32_IRQ_LPUART1_PRIORITY          3
 
 /*
  * ADC driver system settings.
diff --git a/os/hal/ports/STM32/STM32L0xx/stm32_isr.c b/os/hal/ports/STM32/STM32L0xx/stm32_isr.c
index f8a7be8e4..6c96fbd07 100644
--- a/os/hal/ports/STM32/STM32L0xx/stm32_isr.c
+++ b/os/hal/ports/STM32/STM32L0xx/stm32_isr.c
@@ -223,7 +223,9 @@ OSAL_IRQ_HANDLER(STM32_LPUART1_HANDLER) {
 
   OSAL_IRQ_PROLOGUE();
 
+#if STM32_SERIAL_USE_LPUART1
   sd_lld_serve_interrupt(&LPSD1);
+#endif
 
   OSAL_IRQ_EPILOGUE();
 }