diff --git a/firmware/export/debug.h b/firmware/export/debug.h
index 314b495dd2..9d85590136 100644
--- a/firmware/export/debug.h
+++ b/firmware/export/debug.h
@@ -45,8 +45,8 @@ void breakpoint(void);
 #define DEBUGF  debugf
 #define LDEBUGF debugf
 #else
-#define DEBUGF(...)
-#define LDEBUGF(...)
+#define DEBUGF(...) do { } while(0)
+#define LDEBUGF(...) do { } while(0)
 #endif
 #endif
 
diff --git a/firmware/export/logf.h b/firmware/export/logf.h
index 16666449d4..1aca29d5ba 100644
--- a/firmware/export/logf.h
+++ b/firmware/export/logf.h
@@ -51,5 +51,5 @@ void _logf(const char *format, ...) ATTRIBUTE_PRINTF(1, 2);
 /* Allow fine tuning (per file) of the logf output */
 #ifndef LOGF_ENABLE
 #undef logf
-#define logf(...)
+#define logf(...) do { } while(0)
 #endif