diff --git a/include/rcutils/logging.h b/include/rcutils/logging.h
index afd08319..85621318 100644
--- a/include/rcutils/logging.h
+++ b/include/rcutils/logging.h
@@ -516,17 +516,18 @@ void rcutils_logging_console_output_handler(
  * All logging macros ensure that this has been called once.
  */
 #define RCUTILS_LOGGING_AUTOINIT \
-  if (RCUTILS_UNLIKELY(!g_rcutils_logging_initialized)) { \
-    rcutils_ret_t ret = rcutils_logging_initialize(); \
-    if (ret != RCUTILS_RET_OK) { \
-      RCUTILS_SAFE_FWRITE_TO_STDERR( \
-        "[rcutils|" __FILE__ ":" RCUTILS_STRINGIFY(__LINE__) \
-        "] error initializing logging: "); \
-      RCUTILS_SAFE_FWRITE_TO_STDERR(rcutils_get_error_string().str); \
-      RCUTILS_SAFE_FWRITE_TO_STDERR("\n"); \
-      rcutils_reset_error(); \
+  do { \
+    if (RCUTILS_UNLIKELY(!g_rcutils_logging_initialized)) { \
+      if (rcutils_logging_initialize() != RCUTILS_RET_OK) { \
+        RCUTILS_SAFE_FWRITE_TO_STDERR( \
+          "[rcutils|" __FILE__ ":" RCUTILS_STRINGIFY(__LINE__) \
+          "] error initializing logging: "); \
+        RCUTILS_SAFE_FWRITE_TO_STDERR(rcutils_get_error_string().str); \
+        RCUTILS_SAFE_FWRITE_TO_STDERR("\n"); \
+        rcutils_reset_error(); \
+      } \
     } \
-  }
+  } while (0)
 
 #ifdef __cplusplus
 }
diff --git a/resource/logging_macros.h.em b/resource/logging_macros.h.em
index f22d65c5..7d72263e 100644
--- a/resource/logging_macros.h.em
+++ b/resource/logging_macros.h.em
@@ -65,7 +65,7 @@ extern "C"
  */
 #define RCUTILS_LOG_COND_NAMED(severity, condition_before, condition_after, name, ...) \
   do { \
-    RCUTILS_LOGGING_AUTOINIT \
+    RCUTILS_LOGGING_AUTOINIT; \
     static rcutils_log_location_t __rcutils_logging_location = {__func__, __FILE__, __LINE__}; \
     if (rcutils_logging_logger_is_enabled_for(name, severity)) { \
       condition_before \
diff --git a/src/logging.c b/src/logging.c
index 65f6bdaa..59df0af7 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -342,39 +342,35 @@ rcutils_logging_severity_level_from_string(
 
 rcutils_logging_output_handler_t rcutils_logging_get_output_handler(void)
 {
-  RCUTILS_LOGGING_AUTOINIT
+  RCUTILS_LOGGING_AUTOINIT;
   return g_rcutils_logging_output_handler;
 }
 
 void rcutils_logging_set_output_handler(rcutils_logging_output_handler_t function)
 {
-  // *INDENT-OFF* (prevent uncrustify from making unnecessary indents here)
-  RCUTILS_LOGGING_AUTOINIT
+  RCUTILS_LOGGING_AUTOINIT;
   g_rcutils_logging_output_handler = function;
-  // *INDENT-ON*
 }
 
 int rcutils_logging_get_default_logger_level(void)
 {
-  RCUTILS_LOGGING_AUTOINIT
+  RCUTILS_LOGGING_AUTOINIT;
   return g_rcutils_logging_default_logger_level;
 }
 
 void rcutils_logging_set_default_logger_level(int level)
 {
-  // *INDENT-OFF* (prevent uncrustify from making unnecessary indents here)
-  RCUTILS_LOGGING_AUTOINIT
+  RCUTILS_LOGGING_AUTOINIT;
   if (RCUTILS_LOG_SEVERITY_UNSET == level) {
     // Restore the default
     level = RCUTILS_DEFAULT_LOGGER_DEFAULT_LEVEL;
   }
   g_rcutils_logging_default_logger_level = level;
-  // *INDENT-ON*
 }
 
 int rcutils_logging_get_logger_level(const char * name)
 {
-  RCUTILS_LOGGING_AUTOINIT
+  RCUTILS_LOGGING_AUTOINIT;
   if (NULL == name) {
     return -1;
   }
@@ -383,7 +379,7 @@ int rcutils_logging_get_logger_level(const char * name)
 
 int rcutils_logging_get_logger_leveln(const char * name, size_t name_length)
 {
-  RCUTILS_LOGGING_AUTOINIT
+  RCUTILS_LOGGING_AUTOINIT;
   if (NULL == name) {
     return -1;
   }
@@ -421,7 +417,7 @@ int rcutils_logging_get_logger_leveln(const char * name, size_t name_length)
 
 int rcutils_logging_get_logger_effective_level(const char * name)
 {
-  RCUTILS_LOGGING_AUTOINIT
+  RCUTILS_LOGGING_AUTOINIT;
   if (NULL == name) {
     return -1;
   }
@@ -453,7 +449,7 @@ int rcutils_logging_get_logger_effective_level(const char * name)
 
 rcutils_ret_t rcutils_logging_set_logger_level(const char * name, int level)
 {
-  RCUTILS_LOGGING_AUTOINIT
+  RCUTILS_LOGGING_AUTOINIT;
   if (NULL == name) {
     RCUTILS_SET_ERROR_MSG("Invalid logger name");
     return RCUTILS_RET_INVALID_ARGUMENT;
@@ -494,7 +490,7 @@ rcutils_ret_t rcutils_logging_set_logger_level(const char * name, int level)
 
 bool rcutils_logging_logger_is_enabled_for(const char * name, int severity)
 {
-  RCUTILS_LOGGING_AUTOINIT
+  RCUTILS_LOGGING_AUTOINIT;
   int logger_level = g_rcutils_logging_default_logger_level;
   if (name) {
     logger_level = rcutils_logging_get_logger_effective_level(name);