diff --git a/src/Application/Folders/Commands/DisableFolder.cs b/src/Application/Folders/Commands/DisableFolder.cs
index 020bc1fe..f57ab34b 100644
--- a/src/Application/Folders/Commands/DisableFolder.cs
+++ b/src/Application/Folders/Commands/DisableFolder.cs
@@ -40,6 +40,9 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper)
         public async Task<FolderDto> Handle(Command request, CancellationToken cancellationToken)
         {
             var folder = await _context.Folders
+                .Include(x => x.Locker)
+                .ThenInclude(x => x.Room)
+                .ThenInclude(x => x.Department)
                 .FirstOrDefaultAsync(f => f.Id.Equals(request.FolderId), cancellationToken);
 
             if (folder is null)
diff --git a/src/Application/Folders/Commands/EnableFolder.cs b/src/Application/Folders/Commands/EnableFolder.cs
index 2cd66702..e7acf703 100644
--- a/src/Application/Folders/Commands/EnableFolder.cs
+++ b/src/Application/Folders/Commands/EnableFolder.cs
@@ -28,6 +28,9 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper)
         public async Task<FolderDto> Handle(Command request, CancellationToken cancellationToken)
         {
             var folder = await _context.Folders
+                .Include(x => x.Locker)
+                .ThenInclude(x => x.Room)
+                .ThenInclude(x => x.Department)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken);
 
             if (folder is null)
diff --git a/src/Application/Folders/Commands/RemoveFolder.cs b/src/Application/Folders/Commands/RemoveFolder.cs
index 30fb5776..e8bc05f2 100644
--- a/src/Application/Folders/Commands/RemoveFolder.cs
+++ b/src/Application/Folders/Commands/RemoveFolder.cs
@@ -31,6 +31,8 @@ public async Task<FolderDto> Handle(Command request, CancellationToken cancellat
         {
             var folder = await _context.Folders
                 .Include(x => x.Locker)
+                .ThenInclude(x => x.Room)
+                .ThenInclude(x => x.Department)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken);
 
             if (folder is null)
diff --git a/src/Application/Folders/Commands/UpdateFolder.cs b/src/Application/Folders/Commands/UpdateFolder.cs
index 47b6cc32..edfcfe76 100644
--- a/src/Application/Folders/Commands/UpdateFolder.cs
+++ b/src/Application/Folders/Commands/UpdateFolder.cs
@@ -52,6 +52,8 @@ public async Task<FolderDto> Handle(Command request, CancellationToken cancellat
         {
             var folder = await _context.Folders
                 .Include(x => x.Locker)
+                .ThenInclude(x => x.Room)
+                .ThenInclude(x => x.Department)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken);
 
             if (folder is null)
diff --git a/src/Application/Folders/Queries/GetFolderById.cs b/src/Application/Folders/Queries/GetFolderById.cs
index 9b1d07df..c74c30c8 100644
--- a/src/Application/Folders/Queries/GetFolderById.cs
+++ b/src/Application/Folders/Queries/GetFolderById.cs
@@ -26,7 +26,11 @@ public QueryHandler(IApplicationDbContext context, IMapper mapper)
 
         public async Task<FolderDto> Handle(Query request, CancellationToken cancellationToken)
         {
-            var folder = await _context.Folders.FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken);
+            var folder = await _context.Folders
+                .Include(x =>x .Locker)
+                .ThenInclude(x => x.Room)
+                .ThenInclude(x => x.Department)
+                .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken);
 
             if (folder is null)
             {
diff --git a/src/Application/Lockers/Commands/DisableLocker.cs b/src/Application/Lockers/Commands/DisableLocker.cs
index cbde208a..10a78f79 100644
--- a/src/Application/Lockers/Commands/DisableLocker.cs
+++ b/src/Application/Lockers/Commands/DisableLocker.cs
@@ -40,6 +40,8 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper)
         public async Task<LockerDto> Handle(Command request, CancellationToken cancellationToken)
         {
             var locker = await _context.Lockers
+                .Include(x => x.Room)
+                .ThenInclude(x => x.Department)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken);
                 
             if (locker is null)
diff --git a/src/Application/Lockers/Commands/EnableLocker.cs b/src/Application/Lockers/Commands/EnableLocker.cs
index 32dee1aa..49722a1a 100644
--- a/src/Application/Lockers/Commands/EnableLocker.cs
+++ b/src/Application/Lockers/Commands/EnableLocker.cs
@@ -40,6 +40,8 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper)
         public async Task<LockerDto> Handle(Command request, CancellationToken cancellationToken)
         {
             var locker = await _context.Lockers
+                .Include(x => x.Room)
+                .ThenInclude(x => x.Department)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken);
             if (locker is null)
             {
diff --git a/src/Application/Lockers/Commands/RemoveLocker.cs b/src/Application/Lockers/Commands/RemoveLocker.cs
index 4a0ce1fc..a6ab6ad9 100644
--- a/src/Application/Lockers/Commands/RemoveLocker.cs
+++ b/src/Application/Lockers/Commands/RemoveLocker.cs
@@ -41,6 +41,7 @@ public async Task<LockerDto> Handle(Command request, CancellationToken cancellat
         {
             var locker = await _context.Lockers
                 .Include(x => x.Room)
+                .ThenInclude(x => x.Department)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken);
                 
             if (locker is null)
diff --git a/src/Application/Lockers/Commands/UpdateLocker.cs b/src/Application/Lockers/Commands/UpdateLocker.cs
index c55e2fea..20383ef9 100644
--- a/src/Application/Lockers/Commands/UpdateLocker.cs
+++ b/src/Application/Lockers/Commands/UpdateLocker.cs
@@ -50,8 +50,10 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper)
 
         public async Task<LockerDto> Handle(Command request, CancellationToken cancellationToken)
         {
-            var locker = await _context.Lockers.Include(x => x.Room).FirstOrDefaultAsync(
-                x => x.Id.Equals(request.LockerId), cancellationToken);
+            var locker = await _context.Lockers
+                .Include(x => x.Room)
+                .ThenInclude(x => x.Department)
+                .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken);
 
             if (locker is null)
             {
diff --git a/src/Application/Lockers/Queries/GetLockerById.cs b/src/Application/Lockers/Queries/GetLockerById.cs
index 8077335f..64a1bf5a 100644
--- a/src/Application/Lockers/Queries/GetLockerById.cs
+++ b/src/Application/Lockers/Queries/GetLockerById.cs
@@ -26,7 +26,10 @@ public QueryHandler(IApplicationDbContext context, IMapper mapper)
 
         public async Task<LockerDto> Handle(Query request, CancellationToken cancellationToken)
         {
-            var locker = await _context.Lockers.FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken);
+            var locker = await _context.Lockers
+                .Include(x => x.Room)
+                .ThenInclude(x => x.Department)
+                .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken);
 
             if (locker is null)
             {
diff --git a/src/Application/Rooms/Commands/DisableRoom.cs b/src/Application/Rooms/Commands/DisableRoom.cs
index dd9c7afe..c70fe9a5 100644
--- a/src/Application/Rooms/Commands/DisableRoom.cs
+++ b/src/Application/Rooms/Commands/DisableRoom.cs
@@ -40,6 +40,8 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper)
         public async Task<RoomDto> Handle(Command request, CancellationToken cancellationToken)
         {
             var room = await _context.Rooms
+                .Include(x => x.Department)
+                .Include(x => x.Staff)
                 .Include(x => x.Lockers)
                 .ThenInclude(y => y.Folders)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.RoomId), cancellationToken: cancellationToken);
diff --git a/src/Application/Rooms/Commands/EnableRoom.cs b/src/Application/Rooms/Commands/EnableRoom.cs
index af5d710b..d27e9faf 100644
--- a/src/Application/Rooms/Commands/EnableRoom.cs
+++ b/src/Application/Rooms/Commands/EnableRoom.cs
@@ -38,6 +38,8 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper)
         public async Task<RoomDto> Handle(Command request, CancellationToken cancellationToken)
         {
             var room = await _context.Rooms
+                .Include(x => x.Department)
+                .Include(x => x.Staff)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.RoomId), cancellationToken: cancellationToken);
 
             if (room is null)
diff --git a/src/Application/Rooms/Commands/RemoveRoom.cs b/src/Application/Rooms/Commands/RemoveRoom.cs
index 9e35ddc1..b389e8d6 100644
--- a/src/Application/Rooms/Commands/RemoveRoom.cs
+++ b/src/Application/Rooms/Commands/RemoveRoom.cs
@@ -39,6 +39,7 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper)
         public async Task<RoomDto> Handle(Command request, CancellationToken cancellationToken)
         {
             var room = await _context.Rooms
+                .Include(x => x.Department)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.RoomId), cancellationToken: cancellationToken);
 
             if (room is null)
diff --git a/src/Application/Rooms/Commands/UpdateRoom.cs b/src/Application/Rooms/Commands/UpdateRoom.cs
index ade660fe..a4fbe702 100644
--- a/src/Application/Rooms/Commands/UpdateRoom.cs
+++ b/src/Application/Rooms/Commands/UpdateRoom.cs
@@ -50,6 +50,8 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper)
         public async Task<RoomDto> Handle(Command request, CancellationToken cancellationToken)
         {
             var room = await _context.Rooms
+                .Include(x => x.Department)
+                .Include(x => x.Staff)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.RoomId), cancellationToken: cancellationToken);
           
             if (room is null)
diff --git a/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs b/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs
index 31fddbb8..174b8dc9 100644
--- a/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs
+++ b/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs
@@ -36,6 +36,7 @@ public async Task<PaginatedList<RoomDto>> Handle(Query request, CancellationToke
         {
             var rooms = _context.Rooms
                 .Include(x => x.Department)
+                .Include(x => x.Staff)
                 .AsQueryable();
 
             if (!(request.SearchTerm is null || request.SearchTerm.Trim().Equals(string.Empty)))
diff --git a/src/Application/Rooms/Queries/GetRoomById.cs b/src/Application/Rooms/Queries/GetRoomById.cs
index 6e834b68..2d420d10 100644
--- a/src/Application/Rooms/Queries/GetRoomById.cs
+++ b/src/Application/Rooms/Queries/GetRoomById.cs
@@ -28,6 +28,8 @@ public QueryHandler(IApplicationDbContext context, IMapper mapper)
         public async Task<RoomDto> Handle(Query request, CancellationToken cancellationToken)
         {
             var room = await _context.Rooms
+                .Include(x => x.Department)
+                .Include(x => x.Staff)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.RoomId), cancellationToken: cancellationToken);
            
             if (room is null)
diff --git a/src/Application/Users/Queries/GetUserById.cs b/src/Application/Users/Queries/GetUserById.cs
index c4cd1278..7b22fe51 100644
--- a/src/Application/Users/Queries/GetUserById.cs
+++ b/src/Application/Users/Queries/GetUserById.cs
@@ -26,6 +26,7 @@ public QueryHandler(IApplicationDbContext context, IMapper mapper)
         public async Task<UserDto> Handle(Query request, CancellationToken cancellationToken)
         {
             var user = await _context.Users
+                .Include(x => x.Department)
                 .FirstOrDefaultAsync(x => x.Id.Equals(request.UserId), cancellationToken: cancellationToken);
 
             if (user is null)