diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 0a13147247..be966b7b13 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -44,8 +44,8 @@
 
 #define ENCODESQL()                                              \
   do {                                                           \
-    if (tEncodeI32(&encoder, pReq->sqlLen) < 0) return -1;       \
-    if (pReq->sqlLen > 0){                                       \
+    if (pReq->sqlLen > 0 && pReq->sql != NULL){                  \
+      if (tEncodeI32(&encoder, pReq->sqlLen) < 0) return -1;     \
       if (tEncodeCStr(&encoder, pReq->sql) < 0) return -1;       \
     }                                                            \
   } while (0)