diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6478-transaction-bundle-updates-with-multiple-conditional-urls.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6478-transaction-bundle-updates-with-multiple-conditional-urls.yaml
index 55e9a383694..f431323b068 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6478-transaction-bundle-updates-with-multiple-conditional-urls.yaml
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6478-transaction-bundle-updates-with-multiple-conditional-urls.yaml
@@ -4,5 +4,5 @@ issue: 6478
 jira: SMILE-8955
 title: "Transactions with multiple saved search urls will have the saved search urls
         deleted in a batch, instead of 1 at a time.
-        This is a minor performance update
+        This is a minor performance update.
 "
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java
index e1c75f339ec..fa178c39e74 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java
@@ -200,7 +200,7 @@ public class TransactionProcessor extends BaseTransactionProcessor {
 	@SuppressWarnings("rawtypes")
 	protected void postTransactionProcess(TransactionDetails theTransactionDetails) {
 		Set<IResourcePersistentId> resourceIds = theTransactionDetails.getUpdatedResourceIds();
-		if (!resourceIds.isEmpty()) {
+		if (resourceIds != null && !resourceIds.isEmpty()) {
 			List<Long> ids = resourceIds.stream().map(r -> (Long) r.getId()).collect(Collectors.toList());
 
 			myResourceSearchUrlSvc.deleteByResIds(ids);