diff --git a/products/ASC.Files/Core/ApiModels/ResponseDto/FolderContentDto.cs b/products/ASC.Files/Core/ApiModels/ResponseDto/FolderContentDto.cs
index 80cc7f336c0..30fb5bf651f 100644
--- a/products/ASC.Files/Core/ApiModels/ResponseDto/FolderContentDto.cs
+++ b/products/ASC.Files/Core/ApiModels/ResponseDto/FolderContentDto.cs
@@ -155,7 +155,7 @@ public async Task<FolderContentDto<T>> GetAsync<T>(DataWrapper<T> folderItems, i
 
         var filesTask = GetFilesDto(files).ToListAsync();
         var foldersTask = GetFoldersDto(folders).ToListAsync();
-        var currentTask = _folderDtoHelper.GetAsync(folderItems.FolderInfo);
+        var currentTask = GetFoldersDto(new [] { folderItems.FolderInfo }).FirstOrDefaultAsync();
 
         var isEnableBadges = await _badgesSettingsHelper.GetEnabledForCurrentUserAsync();
 
@@ -166,7 +166,7 @@ public async Task<FolderContentDto<T>> GetAsync<T>(DataWrapper<T> folderItems, i
             Total = folderItems.Total,
             New = isEnableBadges ? folderItems.New : 0,
             Count = folderItems.Entries.Count,
-            Current = await currentTask
+            Current = (FolderDto<T>)(await currentTask)
         };
 
         var tasks = await Task.WhenAll(filesTask.AsTask(), foldersTask.AsTask());