diff --git a/src/app/shared/services/api/folder.repo.ts b/src/app/shared/services/api/folder.repo.ts
index 5d9662eb7..b09df3e83 100644
--- a/src/app/shared/services/api/folder.repo.ts
+++ b/src/app/shared/services/api/folder.repo.ts
@@ -407,18 +407,6 @@ export class FolderRepo extends BaseRepo {
 		});
 	}
 
-	public navigateLean(folderVO: FolderVO): Observable<FolderResponse> {
-		const data = [
-			{
-				FolderVO: new FolderVO(folderVO),
-			},
-		];
-
-		return this.http.sendRequest<FolderResponse>('/folder/navigateLean', data, {
-			ResponseClass: FolderResponse,
-		});
-	}
-
 	public async post(folderVOs: FolderVO[]): Promise<FolderResponse> {
 		const data = folderVOs.map((folderVO) => ({
 			FolderVO: new FolderVO(folderVO),
diff --git a/src/app/shared/services/data/data.service.spec.ts b/src/app/shared/services/data/data.service.spec.ts
index 7ade58a76..1d8134b34 100644
--- a/src/app/shared/services/data/data.service.spec.ts
+++ b/src/app/shared/services/data/data.service.spec.ts
@@ -7,8 +7,6 @@ import { DataService } from '@shared/services/data/data.service';
 import { FolderVO, RecordVO } from '@root/app/models';
 import { FolderResponse } from '@shared/services/api/index.repo';
 import { of } from 'rxjs';
-import { HttpTestingController } from '@angular/common/http/testing';
-import { environment } from '@root/environments/environment';
 import { DataStatus } from '@models/data-status.enum';
 
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
@@ -236,9 +234,12 @@ describe('DataService', () => {
 		await service.fetchFullItems([]);
 	});
 
-	it('should refresh the current folder with latest data', (done) => {
+	it('should refresh the current folder with latest data', async () => {
 		const service = TestBed.inject(DataService);
-		const httpMock = TestBed.inject(HttpTestingController);
+		const api = TestBed.inject(ApiService);
+		spyOn(api.folder, 'getWithChildren').and.resolveTo(
+			new FolderResponse(navigateMinData),
+		);
 		const navigateResponse = new FolderResponse(navigateMinData);
 		const currentFolder = navigateResponse.getFolderVO(true) as FolderVO;
 		const childItemCount = currentFolder.ChildItemVOs.length;
@@ -246,16 +247,9 @@ describe('DataService', () => {
 		currentFolder.ChildItemVOs = [];
 		service.setCurrentFolder(currentFolder);
 
-		service
-			.refreshCurrentFolder()
-			.then(() => {
-				expect(currentFolder.ChildItemVOs.length).toBe(childItemCount);
-				done();
-			})
-			.catch(done.fail);
+		await service.refreshCurrentFolder();
 
-		const req = httpMock.expectOne(`${environment.apiUrl}/folder/navigateLean`);
-		req.flush(navigateMinData);
+		expect(currentFolder.ChildItemVOs.length).toBe(childItemCount);
 	});
 
 	it('should add items to thumbRefreshQueue that meet the criteria', (done) => {
diff --git a/src/app/shared/services/data/data.service.ts b/src/app/shared/services/data/data.service.ts
index cf2385f7b..7be54c396 100644
--- a/src/app/shared/services/data/data.service.ts
+++ b/src/app/shared/services/data/data.service.ts
@@ -1,5 +1,4 @@
 import { Injectable, EventEmitter } from '@angular/core';
-import { map } from 'rxjs/operators';
 import { remove, find, findIndex } from 'lodash';
 
 import { ApiService } from '@shared/services/api/api.service';
@@ -376,27 +375,22 @@ export class DataService {
 	public async refreshCurrentFolder(sortOnly = false) {
 		this.debug('refreshCurrentFolder (sortOnly = %o)', sortOnly);
 
-		return await this.api.folder
-			.navigateLean(this.currentFolder)
-			.pipe(
-				map((response: FolderResponse) => {
-					this.debug('refreshCurrentFolder data fetched', sortOnly);
+		const response: FolderResponse = await this.api.folder.getWithChildren([
+			this.currentFolder,
+		]);
 
-					if (!response.isSuccessful) {
-						throw response;
-					}
+		this.debug('refreshCurrentFolder data fetched', sortOnly);
 
-					return response.getFolderVO(true);
-				}),
-			)
-			.toPromise()
-			.then((updatedFolder: FolderVO) => {
-				this.updateChildItems(this.currentFolder, updatedFolder, sortOnly);
-				this.hideItemsInCurrentFolder();
-				this.debug('refreshCurrentFolder done', sortOnly);
-				this.folderUpdate.emit(this.currentFolder);
-				this.currentHiddenItems = [];
-			});
+		if (!response.isSuccessful) {
+			throw response;
+		}
+
+		const updatedFolder = response.getFolderVO(true);
+		this.updateChildItems(this.currentFolder, updatedFolder, sortOnly);
+		this.hideItemsInCurrentFolder();
+		this.debug('refreshCurrentFolder done', sortOnly);
+		this.folderUpdate.emit(this.currentFolder);
+		this.currentHiddenItems = [];
 	}
 
 	public updateChildItems(