diff --git a/radio/src/debug.h b/radio/src/debug.h
index bebb9eb58..0832db330 100644
--- a/radio/src/debug.h
+++ b/radio/src/debug.h
@@ -40,9 +40,10 @@
 #include <inttypes.h>
 #include "rtc.h"
 #include "dump.h"
-#include "serial.h"
 #if defined(CLI)
 #include "cli.h"
+#elif defined(CPUARM)
+#include "serial.h"
 #endif
 
 #if defined(__cplusplus)
diff --git a/radio/src/targets/taranis/serial2_driver.cpp b/radio/src/targets/taranis/serial2_driver.cpp
index 5b4f60036..2369a1c96 100644
--- a/radio/src/targets/taranis/serial2_driver.cpp
+++ b/radio/src/targets/taranis/serial2_driver.cpp
@@ -116,7 +116,11 @@ void serial2Stop()
 
 uint8_t serial2TracesEnabled()
 {
-  return (serial2Mode == 0);
+#if defined(DEBUG)
+  return (serial2Mode == UART_MODE_DEBUG);
+#else
+  return false;
+#endif
 }
 
 #if !defined(SIMU)