diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6599-fix-NPE-in-storage-module.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6599-fix-NPE-in-storage-module.yaml
new file mode 100644
index 00000000000..41992b841d6
--- /dev/null
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6599-fix-NPE-in-storage-module.yaml
@@ -0,0 +1,7 @@
+---
+type: fix
+issue: 6599
+jira: SMILE-9237
+title: "Previously, attempting to restart the Storage module would result in a `NullPointerException` when partition 
+selection mode was set to `PATIENT_ID`, mass ingestion was enabled, and at least one Search Parameter was disabled. This 
+has now been fixed."