diff --git a/radio/src/debug.h b/radio/src/debug.h
index 1faef559a..1fb78330c 100644
--- a/radio/src/debug.h
+++ b/radio/src/debug.h
@@ -57,8 +57,8 @@ uint8_t serial2TracesEnabled();
 }
 #endif
 
-#define TRACE_NOCRLF(...)     do { debugPrintf(__VA_ARGS__); } while(0)
-#define TRACE(...)            do { debugPrintf(__VA_ARGS__); debugPrintf("\r\n"); } while(0)
+#define TRACE_NOCRLF(...)     debugPrintf(__VA_ARGS__)
+#define TRACE(f_, ...)        debugPrintf((f_ "\r\n"), ##__VA_ARGS__)
 #define DUMP(data, size)      dump(data, size)
 #define TRACE_DEBUG(...)      debugPrintf("-D- " __VA_ARGS__)
 #define TRACE_DEBUG_WP(...)   debugPrintf(__VA_ARGS__)