diff --git a/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h b/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h
index b64bc525f..7f7b5a1dc 100644
--- a/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h
+++ b/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h
@@ -576,10 +576,11 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags);
  * @special
  */
 #define dmaStreamDisable(dmastp) {                                          \
-  (dmastp)->stream->CR &= ~STM32_DMA_CR_EN;                                 \
-  while (((dmastp)->stream->CR & STM32_DMA_CR_EN) != 0U)                    \
+  (dmastp)->stream->CR &= ~(STM32_DMA_CR_TCIE | STM32_DMA_CR_HTIE  |        \
+                            STM32_DMA_CR_TEIE | STM32_DMA_CR_DMEIE |        \
+                            STM32_DMA_CR_EN);                               \
+  while (((dmastp)->stream->CR & STM32_DMA_CR_EN) != 0)                     \
     ;                                                                       \
-  (dmastp)->stream->CR = STM32_DMA_CR_RESET_VALUE;                          \
   dmaStreamClearInterrupt(dmastp);                                          \
 }