diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0e7d70a3a3..8d373ade3bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## v2.40.4 - 2023-10-03
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.40.3...v2.40.4)
+
+- [#6898](https://github.com/ORCID/ORCID-Source/pull/6898): Fix NPE when checking for the peer review source
+
+## v2.40.3 - 2023-10-03
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.40.2...v2.40.3)
+
+- [#6897](https://github.com/ORCID/ORCID-Source/pull/6897): 8716 source sorting option
+- [#6895](https://github.com/ORCID/ORCID-Source/pull/6895): feature: Add sorting by source functionality to funding and works
+
+### Fix
+
+- Update comparator class to not be static so we can assign an orcid id every time the comparator class its generated
+- Sort by source unit test
+
+### Feature
+
+- Add sorting by source functionality to funding and works
+
 ## v2.40.2 - 2023-10-02
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.40.1...v2.40.2)
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/PeerReviewManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/PeerReviewManagerReadOnlyImpl.java
index ef33f24cd87..80711fc6207 100644
--- a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/PeerReviewManagerReadOnlyImpl.java
+++ b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/PeerReviewManagerReadOnlyImpl.java
@@ -91,9 +91,9 @@ public List<PeerReviewMinimizedSummary> getPeerReviewMinimizedSummaryList(String
             BigInteger putCode = (BigInteger) q1[2];
             String visibility = q1[3].toString();
             String groupName = q1[4].toString();
-            String sourceId = q1[5] != null ? q1[5].toString() : null;
-            String clientSourceId = q1[6] != null ? q1[6].toString() : null;
-            String assertionOriginSourceId = q1[7] != null ? q1[7].toString() : null;
+            String sourceId = (q1[5] == null) ? null : q1[5].toString();
+            String clientSourceId = (q1[6] == null) ? null : q1[6].toString();
+            String assertionOriginSourceId = (q1[7] == null) ? null : q1[7].toString();
             if (peerReviewMinimizedSummaryList.size() > 0) {
                 List<PeerReviewMinimizedSummary> peerReviews = peerReviewMinimizedSummaryList
                         .stream()