diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index b5b02ef93..9e438951b 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -30,9 +30,9 @@
 #include "time_support.h"
 
 #if 0
-#define JTAG_DEBUG(expr ...)	DEBUG(expr)
+#define JTAG_DEBUG(expr ...)	do { if (1) LOG_DEBUG(expr); } while (0)
 #else
-#define JTAG_DEBUG(expr ...)	do {} while (0)
+#define JTAG_DEBUG(expr ...)	do { if (0) LOG_DEBUG(expr); } while (0)
 #endif
 
 /*