1 files changed, 8 insertions, 3 deletions
diff --git a/src/org/traccar/api/resource/PositionResource.java b/src/org/traccar/api/resource/PositionResource.java
index ec6925b3a..b9e8e877e 100644
--- a/src/org/traccar/api/resource/PositionResource.java
+++ b/src/org/traccar/api/resource/PositionResource.java
@@ -38,9 +38,14 @@ public class PositionResource extends BaseResource {
     public Collection<Position> get(
             @QueryParam("deviceId") long deviceId, @QueryParam("from") String from, @QueryParam("to") String to)
             throws SQLException {
-        Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
-        return Context.getDataManager().getPositions(
-                deviceId, JsonConverter.parseDate(from), JsonConverter.parseDate(to));
+        if (deviceId == 0) {
+            return Context.getConnectionManager().getInitialState(
+                    Context.getPermissionsManager().allowedDevices(getUserId()));
+        } else {
+            Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
+            return Context.getDataManager().getPositions(
+                    deviceId, JsonConverter.parseDate(from), JsonConverter.parseDate(to));
+        }
     }
 
 }