diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 34ecda6ce7..8c5f628034 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -2018,7 +2018,12 @@ static void doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
         cleanupAfterGroupResultGen(pMiaInfo, pRes);
         code = doFilter(pRes, pOperator->exprSupp.pFilterInfo, NULL);
         QUERY_CHECK_CODE(code, lino, _end);
-        break;
+        if (pRes->info.rows == 0) {
+          // After filtering for last group, the result is empty, so we need to continue to process next group
+          continue;
+        } else {
+          break;
+        }
       } else {
         // continue
         pRes->info.id.groupId = pMiaInfo->groupId;
diff --git a/tests/system-test/2-query/fill_with_group.py b/tests/system-test/2-query/fill_with_group.py
index 4a40338504..3847f1dec4 100644
--- a/tests/system-test/2-query/fill_with_group.py
+++ b/tests/system-test/2-query/fill_with_group.py
@@ -374,6 +374,43 @@ class TDTestCase:
         tdSql.query(sql, queryTimes=1)
         tdSql.checkRows(2)
 
+        sql = "SELECT count(*) FROM meters PARTITION BY concat(tbname, 'asd') HAVING(concat(tbname, 'asd') like '%asd')"
+        tdSql.query(sql, queryTimes=1)
+        tdSql.checkRows(10)
+
+        sql = "SELECT count(*), concat(tbname, 'asd') FROM meters PARTITION BY concat(tbname, 'asd') HAVING(concat(tbname, 'asd') like '%asd')"
+        tdSql.query(sql, queryTimes=1)
+        tdSql.checkRows(10)
+
+        sql = "SELECT count(*) FROM meters PARTITION BY t1 HAVING(t1 < 4) order by t1 +1"
+        tdSql.query(sql, queryTimes=1)
+        tdSql.checkRows(4)
+
+        sql = "SELECT count(*), t1 + 100 FROM meters PARTITION BY t1 HAVING(t1 < 4) order by t1 +1"
+        tdSql.query(sql, queryTimes=1)
+        tdSql.checkRows(4)
+
+        sql = "SELECT count(*), t1 + 100 FROM meters PARTITION BY t1 INTERVAL(1d) HAVING(t1 < 4) order by t1 +1 desc"
+        tdSql.query(sql, queryTimes=1)
+        tdSql.checkRows(280)
+
+        sql = "SELECT count(*), concat(t3, 'asd') FROM meters PARTITION BY concat(t3, 'asd') INTERVAL(1d) HAVING(concat(t3, 'asd') like '%5asd' and count(*) = 118)"
+        tdSql.query(sql, queryTimes=1)
+        tdSql.checkRows(1)
+
+        sql = "SELECT count(*), concat(t3, 'asd') FROM meters PARTITION BY concat(t3, 'asd') INTERVAL(1d) HAVING(concat(t3, 'asd') like '%5asd' and count(*) != 118)"
+        tdSql.query(sql, queryTimes=1)
+        tdSql.checkRows(69)
+
+        sql = "SELECT count(*), concat(t3, 'asd') FROM meters PARTITION BY concat(t3, 'asd') INTERVAL(1d) HAVING(concat(t3, 'asd') like '%5asd') order by count(*) asc limit 10"
+        tdSql.query(sql, queryTimes=1)
+        tdSql.checkRows(10)
+
+        sql = "SELECT count(*), concat(t3, 'asd') FROM meters PARTITION BY concat(t3, 'asd') INTERVAL(1d) HAVING(concat(t3, 'asd') like '%5asd' or concat(t3, 'asd') like '%3asd') order by count(*) asc limit 10000"
+        tdSql.query(sql, queryTimes=1)
+        tdSql.checkRows(140)
+
+
     def run(self):
         self.prepareTestEnv()
         self.test_partition_by_with_interval_fill_prev_new_group_fill_error()