diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h
index 3b5c0012ba..e8257ac2db 100644
--- a/firmware/config/stm32f4ems/efifeatures.h
+++ b/firmware/config/stm32f4ems/efifeatures.h
@@ -243,16 +243,21 @@
 #define EFI_CONSOLE_UART_DEVICE (&SD3)
 #endif
 
-// Use 'UART' DMA-mode driver instead of 'SERIAL'
-#define TS_UART_DMA_MODE FALSE
+/**
+ * Use 'HAL_USE_UART' DMA-mode driver instead of 'HAL_USE_SERIAL'
+ *
+ * See also
+ *  STM32_SERIAL_USE_USARTx
+ *  STM32_UART_USE_USARTx
+ * in mcuconf.h
+ */
+#define TS_UART_DMA_MODE TRUE
 
 #define TS_DMA_UART_DEVICE (&UARTD3)
 #define TS_SERIAL_UART_DEVICE (&SD3)
 
-// todo: add DMA-mode for Console & GPS?
+// todo: add DMA-mode for Console?
 #if TS_UART_DMA_MODE
-#undef EFI_UART_GPS
-#define EFI_UART_GPS FALSE
 #undef EFI_CONSOLE_UART_DEVICE
 #endif
 
diff --git a/firmware/config/stm32f4ems/halconf.h b/firmware/config/stm32f4ems/halconf.h
index 28faec0877..dd3c074816 100644
--- a/firmware/config/stm32f4ems/halconf.h
+++ b/firmware/config/stm32f4ems/halconf.h
@@ -132,13 +132,8 @@
  * @brief   Enables the SERIAL subsystem.
  */
 #if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-/* Configured in efifeatures.h */
-#if TS_UART_DMA_MODE
-#define HAL_USE_SERIAL              FALSE
-#else
 #define HAL_USE_SERIAL              TRUE
 #endif
-#endif
 
 /**
  * @brief   Enables the SERIAL over USB subsystem.
diff --git a/firmware/config/stm32f4ems/mcuconf.h b/firmware/config/stm32f4ems/mcuconf.h
index 47d49e6511..84d2845edc 100644
--- a/firmware/config/stm32f4ems/mcuconf.h
+++ b/firmware/config/stm32f4ems/mcuconf.h
@@ -281,7 +281,7 @@
  */
 #define STM32_SERIAL_USE_USART1             TRUE
 #define STM32_SERIAL_USE_USART2             TRUE
-#define STM32_SERIAL_USE_USART3             TRUE
+#define STM32_SERIAL_USE_USART3             FALSE
 #define STM32_SERIAL_USE_UART4              FALSE
 #define STM32_SERIAL_USE_UART5              FALSE
 #define STM32_SERIAL_USE_USART6             FALSE