diff --git a/platform/publicreport/nuisance.go b/platform/publicreport/nuisance.go
index 1130068b..c1249ace 100644
--- a/platform/publicreport/nuisance.go
+++ b/platform/publicreport/nuisance.go
@@ -93,7 +93,12 @@ func NuisanceReportForOrganization(ctx context.Context, org_id int32) ([]Nuisanc
 		return nil, fmt.Errorf("images for report: %w", err)
 	}
 	for i := range reports {
-		reports[i].Images = images_by_id[reports[i].ID]
+		images, ok := images_by_id[reports[i].ID]
+		if ok {
+			reports[i].Images = images
+		} else {
+			reports[i].Images = []types.Image{}
+		}
 	}
 	return reports, nil
 }
diff --git a/platform/publicreport/water.go b/platform/publicreport/water.go
index 40007245..56340efd 100644
--- a/platform/publicreport/water.go
+++ b/platform/publicreport/water.go
@@ -97,7 +97,12 @@ func WaterReportForOrganization(ctx context.Context, org_id int32) ([]Water, err
 		return nil, fmt.Errorf("images for report: %w", err)
 	}
 	for i := range reports {
-		reports[i].Images = images_by_id[reports[i].ID]
+		images, ok := images_by_id[reports[i].ID]
+		if ok {
+			reports[i].Images = images
+		} else {
+			reports[i].Images = []types.Image{}
+		}
 	}
 	return reports, nil
 }