diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 3e72d75a84..bd61117a85 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -1325,7 +1325,7 @@ static int32_t tableApplyFunctionsOnBlock(SQueryRuntimeEnv *pRuntimeEnv, SDataBl
       setQueryStatus(pQuery, QUERY_RESBUF_FULL);
     }
     
-    if (numOfRes >= pQuery->limit.limit + pQuery->limit.offset) {
+    if ((pQuery->limit.limit >= 0) && numOfRes >= (pQuery->limit.limit + pQuery->limit.offset)) {
       setQueryStatus(pQuery, QUERY_COMPLETED);
     }
   }