diff --git a/.clang-format b/.clang-format
index 39bdf03f1ae..dfbfc2e53f9 100644
--- a/.clang-format
+++ b/.clang-format
@@ -84,7 +84,6 @@ StatementMacros:
   - H5_GCC_DIAG_OFF
   - H5_GCC_DIAG_ON
   - H5_LEAVE
-  - HDONE_ERROR
   - HGOTO_DONE
   - HGOTO_ERROR
   - HMPI_DONE_ERROR
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h
index f62053f2406..272a85b8251 100644
--- a/src/H5Eprivate.h
+++ b/src/H5Eprivate.h
@@ -55,10 +55,10 @@ do {
  *      without jumping to any labels)
  */
 #define HDONE_ERROR(maj, min, ret_val, ...)                                                                  \
-    {                                                                                                        \
+    do {                                                                                                     \
         HCOMMON_ERROR(maj, min, __VA_ARGS__);                                                                \
         ret_value = ret_val;                                                                                 \
-    }
+    } while(0)
 
 /*
  * HGOTO_ERROR macro, used to facilitate error reporting between a