diff --git a/targets/TARGET_STM/serial_api.c b/targets/TARGET_STM/serial_api.c
index 1aeca003aa..a18b85ba41 100644
--- a/targets/TARGET_STM/serial_api.c
+++ b/targets/TARGET_STM/serial_api.c
@@ -568,12 +568,12 @@ HAL_StatusTypeDef init_uart(serial_t *obj)
 #if defined(LPUART1_BASE)
     if (huart->Instance == LPUART1) {
         if (obj_s->baudrate <= 9600) {
-#if ((MBED_CONF_TARGET_LPUART_CLOCK_SOURCE) & USE_LPUART_CLK_LSE) && !TARGET_STM32H7 && !TARGET_STM32WB
+#if ((MBED_CONF_TARGET_LPUART_CLOCK_SOURCE) & USE_LPUART_CLK_LSE) && defined(USART_CR3_UCESM)
             HAL_UARTEx_EnableClockStopMode(huart);
 #endif
             HAL_UARTEx_EnableStopMode(huart);
         } else {
-#if (!defined(TARGET_STM32H7) && !defined(TARGET_STM32WB))
+#if defined(USART_CR3_UCESM)
             HAL_UARTEx_DisableClockStopMode(huart);
 #endif
             HAL_UARTEx_DisableStopMode(huart);