diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java
index 6ffdf9b..951f32d 100644
--- a/server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java
+++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java
@@ -62,7 +62,8 @@ public class UserRepositoryImpl implements UserRepository {
 
     @Override
     public Collection<Room> findAllLinkedUserRooms(User user) {
-        return Collections.unmodifiableSet(userRooms.get(user));
+        var result = userRooms.get(user);
+        return Collections.unmodifiableSet(result == null? new HashSet<>() : result);
     }
 
     @Override