diff --git a/server/StrDss.Data/Repositories/RentalListingRepository.cs b/server/StrDss.Data/Repositories/RentalListingRepository.cs
index 36d55a1a..e607accb 100644
--- a/server/StrDss.Data/Repositories/RentalListingRepository.cs
+++ b/server/StrDss.Data/Repositories/RentalListingRepository.cs
@@ -94,14 +94,14 @@ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(stri
             ApplyFilters(all, address, url, listingId, hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);
 
             var groupedQuery = query
-                .AsNoTracking()
                 .GroupBy(x => new { x.EffectiveBusinessLicenceNo, x.EffectiveHostNm, x.MatchAddressTxt })
                 .Select(g => new RentalListingGroupDto
                 {
                     EffectiveBusinessLicenceNo = g.Key.EffectiveBusinessLicenceNo,
                     EffectiveHostNm = g.Key.EffectiveHostNm,
                     MatchAddressTxt = g.Key.MatchAddressTxt
-                });
+                })
+                .AsNoTracking();
 
             var extraSort = "";
 
diff --git a/server/StrDss.Data/Repositories/RepositoryBase.cs b/server/StrDss.Data/Repositories/RepositoryBase.cs
index 307ec24d..e1d39601 100644
--- a/server/StrDss.Data/Repositories/RepositoryBase.cs
+++ b/server/StrDss.Data/Repositories/RepositoryBase.cs
@@ -40,12 +40,6 @@ public async Task<PagedDto<TOutput>> Page<TInput, TOutput>(IQueryable<TInput> li
 
             var totalRecords = list.Count();
 
-            stopwatch.Stop();
-
-            _logger.LogDebug($"Get Grouped Listings (group) - Counting groups. Page Size: {pageSize}, Page Number: {pageNumber}, Time: {stopwatch.Elapsed.TotalSeconds} seconds");
-
-            stopwatch.Restart();
-
             if (pageNumber <= 0) pageNumber = 1;
 
             var sort = "";
@@ -72,6 +66,12 @@ public async Task<PagedDto<TOutput>> Page<TInput, TOutput>(IQueryable<TInput> li
                     .Take(pageSize);
             }
 
+            stopwatch.Stop();
+
+            _logger.LogDebug($"Get Grouped Listings (group) - Counting groups. Page Size: {pageSize}, Page Number: {pageNumber}, Time: {stopwatch.Elapsed.TotalSeconds} seconds");
+
+            stopwatch.Restart();
+
             var result = await pagedList.ToListAsync();
 
             stopwatch.Stop();