From 34dc1eec81a90c2b80b30148d386818190f26f48 Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Mon, 8 Dec 2025 17:48:02 +0200
Subject: [PATCH] Fix NPE

---
 .../java/org/thingsboard/server/dao/sql/user/JpaUserDao.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java
index 0cb5be92ee..6b77460bfb 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java
@@ -141,7 +141,7 @@ public class JpaUserDao extends JpaAbstractDao<UserEntity, User> implements User
     @Override
     public UserAuthDetails findUserAuthDetailsByUserId(UUID tenantId, UUID userId) {
         TbPair<UserEntity, Boolean> result = userRepository.findUserAuthDetailsByUserId(userId);
-        return new UserAuthDetails(result.getFirst().toData(), result.getSecond());
+        return result != null ? new UserAuthDetails(result.getFirst().toData(), result.getSecond()) : null;
     }
 
     @Override