diff --git a/projects/prison-custody-status-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/PrisonerMovement.kt b/projects/prison-custody-status-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/PrisonerMovement.kt
index 0c28ebfcbd..2e610986db 100644
--- a/projects/prison-custody-status-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/PrisonerMovement.kt
+++ b/projects/prison-custody-status-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/PrisonerMovement.kt
@@ -79,4 +79,4 @@ fun PrisonerMovement.statusDateValid(custody: Custody): Boolean =
     occurredAt <= ZonedDateTime.now() && occurredAt.toLocalDate() >= custody.statusChangeDate
 
 fun PrisonerMovement.locationDateValid(custody: Custody): Boolean =
-    occurredAt <= ZonedDateTime.now() && occurredAt.toLocalDate() >= custody.locationChangeDate
+    occurredAt <= ZonedDateTime.now() && (custody.locationChangeDate == null || occurredAt.toLocalDate() >= custody.locationChangeDate)