diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushAggregationIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushAggregationIntoTableScan.java
index 771135627c9e..df3a51706f82 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushAggregationIntoTableScan.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushAggregationIntoTableScan.java
@@ -160,13 +160,15 @@ private PushDownLevel calculatePushDownLevel(
       }
 
       // calculate DataSet part
+      boolean singleDeviceEntry = tableScanNode.getDeviceEntries().size() < 2;
       if (groupingKeys.isEmpty()) {
         // GlobalAggregation
-        if (tableScanNode.getDeviceEntries().size() < 2) {
+        if (singleDeviceEntry) {
           return PushDownLevel.COMPLETE;
+        } else {
+          // We need to two-stage Aggregation to combine Aggregation result of different DeviceEntry
+          return PushDownLevel.PARTIAL;
         }
-        // We need to two-stage Aggregation to combine Aggregation result of different DeviceEntry
-        return PushDownLevel.PARTIAL;
       }
 
       List<FunctionCall> dateBinFunctionsOfTime = new ArrayList<>();
@@ -185,8 +187,9 @@ private PushDownLevel calculatePushDownLevel(
         // appear in groupingKeys.
 
         return PushDownLevel.NOOP;
-      } else if (ImmutableSet.copyOf(groupingKeys)
-          .containsAll(tableScanNode.getIdColumnsInTableStore(metadata, session))) {
+      } else if (singleDeviceEntry
+          || ImmutableSet.copyOf(groupingKeys)
+              .containsAll(tableScanNode.getIdColumnsInTableStore(metadata, session))) {
         // If all ID columns appear in groupingKeys and no Measurement column appears, we can push
         // down completely.
         return PushDownLevel.COMPLETE;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java
index 59ca723b02c9..91d72d587b88 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java
@@ -622,6 +622,35 @@ public void completePushDownTest() {
                     "testdb.table1",
                     ImmutableList.of("tag1", "tag2", "tag3", "attr1", "time", "count"),
                     ImmutableSet.of("tag1", "tag2", "tag3", "attr1", "time", "s2")))));
+
+    // Global Aggregation or partialPushDown Aggregation with only one deviceEntry
+
+    // Output - AggTableScan
+    assertPlan(
+        planTester.createPlan("SELECT count(s2) FROM table1 where tag1='beijing' and tag2='A1'"),
+        output(
+            aggregationTableScan(
+                singleGroupingSet(),
+                ImmutableList.of(), // UnStreamable
+                Optional.empty(),
+                SINGLE,
+                "testdb.table1",
+                ImmutableList.of("count"),
+                ImmutableSet.of("s2"))));
+
+    assertPlan(
+        planTester.createPlan(
+            "SELECT count(s2) FROM table1 where tag1='beijing' and tag2='A1' group by tag3"),
+        output(
+            project(
+                aggregationTableScan(
+                    singleGroupingSet("tag3"),
+                    ImmutableList.of("tag3"),
+                    Optional.empty(),
+                    SINGLE,
+                    "testdb.table1",
+                    ImmutableList.of("tag3", "count"),
+                    ImmutableSet.of("s2", "tag3")))));
   }
 
   @Test