diff --git a/source/libs/executor/src/timesliceoperator.c b/source/libs/executor/src/timesliceoperator.c
index 7024b092b0..08121260d1 100644
--- a/source/libs/executor/src/timesliceoperator.c
+++ b/source/libs/executor/src/timesliceoperator.c
@@ -473,7 +473,6 @@ static void doTimesliceImpl(SOperatorInfo* pOperator, STimeSliceOperatorInfo* pS
     }
 
     if (pSliceInfo->current > pSliceInfo->win.ekey) {
-      setOperatorCompleted(pOperator);
       break;
     }
 
@@ -486,7 +485,6 @@ static void doTimesliceImpl(SOperatorInfo* pOperator, STimeSliceOperatorInfo* pS
       pSliceInfo->current =
           taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
       if (pSliceInfo->current > pSliceInfo->win.ekey) {
-        setOperatorCompleted(pOperator);
         break;
       }
     } else if (ts < pSliceInfo->current) {
@@ -510,7 +508,6 @@ static void doTimesliceImpl(SOperatorInfo* pOperator, STimeSliceOperatorInfo* pS
           }
 
           if (pSliceInfo->current > pSliceInfo->win.ekey) {
-            setOperatorCompleted(pOperator);
             break;
           }
         } else {
@@ -544,14 +541,13 @@ static void doTimesliceImpl(SOperatorInfo* pOperator, STimeSliceOperatorInfo* pS
       doKeepPrevRows(pSliceInfo, pBlock, i);
 
       if (pSliceInfo->current > pSliceInfo->win.ekey) {
-        setOperatorCompleted(pOperator);
         break;
       }
     }
   }
 }
 
-static void revertTimesliceInfo(STimeSliceOperatorInfo* pSliceInfo) {
+static void restoreTimesliceInfo(STimeSliceOperatorInfo* pSliceInfo) {
   pSliceInfo->current = pSliceInfo->win.skey;
   pSliceInfo->prevTsSet = false;
 }
@@ -582,6 +578,7 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
     while (1) {
       SSDataBlock* pBlock = downstream->fpSet.getNextFn(downstream);
       if (pBlock == NULL) {
+        setOperatorCompleted(pOperator);
         break;
       }
 
@@ -591,7 +588,8 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
         if (pSliceInfo->groupId != pBlock->info.id.groupId) {
           pSliceInfo->groupId = pBlock->info.id.groupId;
           pSliceInfo->pNextGroupRes = pBlock;
-          break;
+          restoreTimesliceInfo(pSliceInfo);
+          goto _group_over;
         }
       }
 
@@ -618,11 +616,14 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
       pSliceInfo->current =
           taosTimeAdd(pSliceInfo->current, pInterval->interval, pInterval->intervalUnit, pInterval->precision);
     }
+
+_group_over:
+    doFilter(pResBlock, pOperator->exprSupp.pFilterInfo, NULL);
+    if (pOperator->status == OP_EXEC_DONE) {
+      break;
+    }
   }
 
-
-  doFilter(pResBlock, pOperator->exprSupp.pFilterInfo, NULL);
-
   // restore the value
   setTaskStatus(pOperator->pTaskInfo, TASK_COMPLETED);
   if (pResBlock->info.rows == 0) {