diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 77b4e5368e..954040cfb8 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -380,12 +380,9 @@ ProcessUtility(Node *parsetree,
  */
 #define UTILITY_BEGIN_QUERY(isComplete) \
 	do { \
-		bool		_needCleanup = false; \
+		bool		_needCleanup; \
 		\
-		if (isComplete) \
-		{ \
-			_needCleanup = EventTriggerBeginCompleteQuery(); \
-		} \
+		_needCleanup = (isComplete) && EventTriggerBeginCompleteQuery(); \
 		\
 		PG_TRY(); \
 		{ \