diff --git a/radio/src/FreeRTOSConfig.h b/radio/src/FreeRTOSConfig.h
index c97c3a3b9..b8e1e86be 100644
--- a/radio/src/FreeRTOSConfig.h
+++ b/radio/src/FreeRTOSConfig.h
@@ -57,7 +57,6 @@ extern uint32_t SystemCoreClock;
 #else
   #define configMAX_TASK_NAME_LEN         10
   #define configUSE_TRACE_FACILITY        1
-  //#define configCHECK_FOR_STACK_OVERFLOW  2
   #define configCHECK_FOR_STACK_OVERFLOW  0
 #endif
 
diff --git a/radio/src/boards/generic_stm32/CMakeLists.txt b/radio/src/boards/generic_stm32/CMakeLists.txt
index 180a28302..629da13d7 100644
--- a/radio/src/boards/generic_stm32/CMakeLists.txt
+++ b/radio/src/boards/generic_stm32/CMakeLists.txt
@@ -40,6 +40,10 @@ add_library(minimal_board_lib OBJECT EXCLUDE_FROM_ALL ${MINIMAL_BOARD_LIB_SRC})
 add_library(board_lib OBJECT EXCLUDE_FROM_ALL ${BOARD_LIB_SRC})
 add_dependencies(board_lib minimal_board_lib)
 
+if(DEBUG)
+  target_compile_definitions(board_lib PRIVATE DEBUG)
+endif()
+
 set(FIRMWARE_SRC ${FIRMWARE_SRC}
   $<TARGET_OBJECTS:minimal_board_lib>
   $<TARGET_OBJECTS:board_lib>
diff --git a/radio/src/targets/common/arm/stm32/h7/CMakeLists.txt b/radio/src/targets/common/arm/stm32/h7/CMakeLists.txt
index 2e28ffe95..48744b2f6 100644
--- a/radio/src/targets/common/arm/stm32/h7/CMakeLists.txt
+++ b/radio/src/targets/common/arm/stm32/h7/CMakeLists.txt
@@ -163,7 +163,11 @@ if(NOT NATIVE_BUILD)
   target_include_directories(freertos
     PUBLIC  ${RTOS_DIR}/portable/GCC/ARM_CM4F
     PRIVATE ${RTOS_DIR}/include
-    )
+  )
+
+  if(DEBUG)
+    target_compile_definitions(freertos PRIVATE DEBUG)
+  endif()
 
   include_directories(${RTOS_DIR}/portable/GCC/ARM_CM4F)