diff --git a/metrics.go b/metrics.go
index 9c5f2ed..e153430 100644
--- a/metrics.go
+++ b/metrics.go
@@ -184,7 +184,7 @@ func lastmetricsHandler(response http.ResponseWriter, request *http.Request) {
 		//data := []byte(fmt.Sprintf(`from(bucket:"beielibucket") |> range(start:-365d) |> filter(fn: (r) => r.deveui == "%s") |> filter(fn: (r) => r._field == "v" or r._field == "t") |> last() |> yield(name: "last")`,mydeveui))
 		data := []byte(fmt.Sprintf(`from(bucket:"beielibucket") 
                                          |> range(start:-365d) 
-                                         |> filter(fn: (r) => r.deveui == "%s") 
+                                         |> filter(fn: (r) => r._measurement == "measurement" and r.deveui == "%s") 
                                          |> filter(fn: (r) => r._field == "t" or r._field == "h" or r._field == "w" or r._field == "p" or r._field == "vp") 
                                          |> last() |> yield(name: "last")`, mydeveui))