diff --git a/projects/manage-supervision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ActivityService.kt b/projects/manage-supervision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ActivityService.kt
index 66c5622cbd..09a82cc62f 100644
--- a/projects/manage-supervision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ActivityService.kt
+++ b/projects/manage-supervision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ActivityService.kt
@@ -37,8 +37,9 @@ class ActivityService(
         val response =
             probationSearchClient.contactSearch(probationSearchRequest, pageable.pageNumber, pageable.pageSize)
         val ids = response.results.map { it.id }
-        val contacts = ids.map { contactId ->
-            contactRepository.findByPersonIdAndIdIn(summary.id, ids).associateBy { it.id }[contactId]!!
+
+        val contacts = ids.mapNotNull { contactId ->
+            contactRepository.findByPersonIdAndIdIn(summary.id, ids).associateBy { it.id }[contactId]
         }
 
         return PersonActivitySearchResponse(