diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
index c5ede76fb..c5ad21caf 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
@@ -94,7 +94,15 @@ private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModel
 
             var resourcesFound = await this.resourceRepository.GetResourcesFromIds(findwiseResourceIds);
 
-            List<ResourceMetadataViewModel> resourceMetadataViewModels = resourcesFound.Select(resource => MapToViewModel(resource, resourceActivities.Where(x => x.ResourceId == resource.Id).ToList()))
+            if (currentUserId.HasValue)
+            {
+                List<int> resourceIds = resourcesFound.Select(x => x.Id).ToList();
+                List<int> userIds = new List<int>() { currentUserId.Value };
+
+                resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(resourceIds, userIds))?.ToList() ?? new List<ResourceActivityDTO>() { };
+            }
+
+            List<ResourceMetadataViewModel> resourceMetadataViewModels = resourcesFound.Select(resource => this.MapToViewModel(resource, resourceActivities.Where(x => x.ResourceId == resource.Id).ToList()))
                 .OrderBySequence(findwiseResourceIds)
                 .ToList();
 
@@ -109,13 +117,6 @@ private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModel
                     unmatchedResourcesIdsString);
             }
 
-            if (currentUserId.HasValue)
-            {
-                List<int> resourceIds = resourcesFound.Select(x => x.Id).ToList();
-                List<int> userIds = new List<int>() { currentUserId.Value };
-
-                resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(resourceIds, userIds))?.ToList() ?? new List<ResourceActivityDTO>() { };
-            }
             return resourceMetadataViewModels;
         }