1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/api/security/PermissionsService.java b/src/main/java/org/traccar/api/security/PermissionsService.java
index ea7a9d572..e5bc52f22 100644
--- a/src/main/java/org/traccar/api/security/PermissionsService.java
+++ b/src/main/java/org/traccar/api/security/PermissionsService.java
@@ -58,8 +58,12 @@ public class PermissionsService {
 
     public User getUser(long userId) throws StorageException {
         if (user == null && userId > 0) {
-            user = storage.getObject(
-                    User.class, new Request(new Columns.All(), new Condition.Equals("id", "id", userId)));
+            if (userId == ServiceAccountUser.ID) {
+                user = new ServiceAccountUser();
+            } else {
+                user = storage.getObject(
+                        User.class, new Request(new Columns.All(), new Condition.Equals("id", "id", userId)));
+            }
         }
         return user;
     }