diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index d065f37585d829371a3cc6992ecd22769ee60fde..2097eca045519ba29805a8575aed7412cb3fcf38 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -4014,10 +4014,6 @@ static int32_t getColQueryCondExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSqlEx
       // TODO: more error handling
     } END_TRY
 
-    if (tbufTell(&bw) >= TSDB_MAX_WHERE_LEN ) {
-      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "where condition string is too long");
-    }
-
     // add to required table column list
     STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, i);
     int64_t uid = pTableMetaInfo->pTableMeta->id.uid;
@@ -5203,10 +5199,6 @@ static int32_t getTagQueryCondExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SCondE
       // TODO: more error handling
     } END_TRY
 
-    if (tbufTell(&bw) >= TSDB_MAX_WHERE_LEN ) {
-      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "where condition string is too long");
-    }
-
     // add to required table column list
     STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, i);
     int64_t uid = pTableMetaInfo->pTableMeta->id.uid;
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index b88b1eac00410cc6d35760c157d44e02f41c1475..bd1c3518a3b378368334202447ab746de8186150 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -218,7 +218,6 @@ do { \
 #define TSDB_MAX_TAGS_LEN         16384
 #define TSDB_MAX_TAGS             128
 #define TSDB_MAX_TAG_CONDITIONS   1024
-#define TSDB_MAX_WHERE_LEN        65535
 
 #define TSDB_AUTH_LEN             16
 #define TSDB_KEY_LEN              16