1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/session/cache/CacheManager.java b/src/main/java/org/traccar/session/cache/CacheManager.java
index aca3df52d..102a31ecd 100644
--- a/src/main/java/org/traccar/session/cache/CacheManager.java
+++ b/src/main/java/org/traccar/session/cache/CacheManager.java
@@ -69,7 +69,8 @@ public class CacheManager {
     public <T extends BaseModel> T getObject(Class<T> clazz, long id) {
         try {
             lock.readLock().lock();
-            return deviceCache.get(new CacheKey(clazz, id)).getValue();
+            var cacheValue = deviceCache.get(new CacheKey(clazz, id));
+            return cacheValue != null ? cacheValue.getValue() : null;
         } finally {
             lock.readLock().unlock();
         }