diff --git a/metrics.go b/metrics.go
index a30c3aa..aa66d9d 100644
--- a/metrics.go
+++ b/metrics.go
@@ -391,8 +391,9 @@ func getLastMetrics(deveui string) OneMetric {
                                  |> range(start:-365d) 
                                  |> filter(fn: (r) => r._measurement == "measurement" and r.deveui == "%s")
                                  |> filter(fn: (r) => r._field == "lon" or r._field == "lat" or r._field == "vbat" or r._field == "fw") 
-                                 |> last(column: "_time")
-                                 |> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")`, deveui))
+                                 |> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")
+                                 |> filter(fn: (r) => r.lon != 0) 
+                                 |> last(column: "_time")`, deveui))
 
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
 	if err != nil {