diff --git a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/measurements/DevicePropertyMeasurement.java b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/measurements/DevicePropertyMeasurement.java
index 38348f54..6aad8fc8 100644
--- a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/measurements/DevicePropertyMeasurement.java
+++ b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/measurements/DevicePropertyMeasurement.java
@@ -69,8 +69,6 @@ class DevicePropertyMeasurement extends StaticMeasurement {
             : QueryParamEntity
             .newQuery()
             .doPaging(0, history)
-            .where("deviceId", deviceId)
-            .and("property", metadata.getId())
             .execute(q -> deviceDataService.queryProperty(deviceId, q, metadata.getId()))
             .map(data -> SimpleMeasurementValue.of(data, data.getTimestamp()))
             .sort(MeasurementValue.sort());
diff --git a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/DefaultDeviceDataService.java b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/DefaultDeviceDataService.java
index 9e23023c..a0ead1e8 100644
--- a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/DefaultDeviceDataService.java
+++ b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/DefaultDeviceDataService.java
@@ -104,7 +104,7 @@ public class DefaultDeviceDataService implements DeviceDataService {
 
         return this
             .getDeviceStrategy(deviceId)
-            .flatMapMany(strategy -> strategy.queryProperty(deviceId, query));
+            .flatMapMany(strategy -> strategy.queryProperty(deviceId, query, property));
     }
 
     @Override