diff --git a/Api.SeaHavenIndustries.Tests/WorkOrderUpliftServiceConflictTests.cs b/Api.SeaHavenIndustries.Tests/WorkOrderUpliftServiceConflictTests.cs
index 9325b3d..d9a503c 100644
--- a/Api.SeaHavenIndustries.Tests/WorkOrderUpliftServiceConflictTests.cs
+++ b/Api.SeaHavenIndustries.Tests/WorkOrderUpliftServiceConflictTests.cs
@@ -56,6 +56,10 @@ public sealed class WorkOrderUpliftServiceConflictTests
             .ReturnsAsync(0m);
         upliftData.Setup(x => x.StageAsync(It.IsAny<DispatchUpliftRequest>(), It.IsAny<CancellationToken>()))
             .Returns(Task.CompletedTask);
+        upliftData.Setup(x => x.GetEvidenceFilesAsync(
+                It.IsAny<IReadOnlyCollection<int>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<int, IReadOnlyList<UpliftEvidenceFileData>>());
         upliftData.Setup(x => x.SaveChangesAsync(It.IsAny<CancellationToken>()))
             .Returns(async () =>
             {
diff --git a/SeaHaven.Services/Implementation/WorkOrderUpliftService.cs b/SeaHaven.Services/Implementation/WorkOrderUpliftService.cs
index 9421182..0e3af52 100644
--- a/SeaHaven.Services/Implementation/WorkOrderUpliftService.cs
+++ b/SeaHaven.Services/Implementation/WorkOrderUpliftService.cs
@@ -469,7 +469,8 @@ namespace SeaHaven.Services.Implementation
             Dispatch dispatch,
             CancellationToken cancellationToken)
         {
-            var files = await _upliftData.GetEvidenceFilesAsync(new[] { request.Id }, cancellationToken);
+            var files = await _upliftData.GetEvidenceFilesAsync(new[] { request.Id }, cancellationToken)
+                ?? new Dictionary<int, IReadOnlyList<UpliftEvidenceFileData>>();
             if (!files.TryGetValue(request.Id, out var attachments))
                 attachments = Array.Empty<UpliftEvidenceFileData>();