diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 1bbf05294d..3034911872 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -3957,7 +3957,7 @@ static SSDataBlock* doApplyIndefinitFunction(SOperatorInfo* pOperator) {
 
     doFilter(pIndefInfo->pCondition, pInfo->pRes);
     size_t rows = pInfo->pRes->info.rows;
-    if (rows >= 0) {
+    if (rows > 0 || pOperator->status == OP_EXEC_DONE) {
       break;
     }
   }
diff --git a/tests/system-test/2-query/max_partition.py b/tests/system-test/2-query/max_partition.py
index a352865c45..109c9075f5 100644
--- a/tests/system-test/2-query/max_partition.py
+++ b/tests/system-test/2-query/max_partition.py
@@ -169,13 +169,13 @@ class TDTestCase:
         tdSql.checkData(0,1,self.row_nums)
 
         tdSql.query("select c1 , mavg(c1 ,2 ) from stb partition by c1")
-        tdSql.checkRows(72)
+        tdSql.checkRows(90)
 
         tdSql.query("select c1 , diff(c1 , 0) from stb partition by c1")
-        tdSql.checkRows(72)
+        tdSql.checkRows(90)
 
         tdSql.query("select c1 , csum(c1) from stb partition by c1")
-        tdSql.checkRows(80)
+        tdSql.checkRows(100)
 
         tdSql.query("select c1 , sample(c1,2) from stb partition by c1 order by c1")
         tdSql.checkRows(21)
@@ -191,7 +191,7 @@ class TDTestCase:
         tdSql.checkData(0,1,None)
 
         tdSql.query("select c1 , DERIVATIVE(c1,2,1) from stb partition by c1 order by c1")
-        tdSql.checkRows(72)
+        tdSql.checkRows(90)
         # bug need fix
         # tdSql.checkData(0,1,None)