diff --git a/src/main/java/org/dependencytrack/persistence/FindingsQueryManager.java b/src/main/java/org/dependencytrack/persistence/FindingsQueryManager.java
index e28bef19c..a6f2acc58 100644
--- a/src/main/java/org/dependencytrack/persistence/FindingsQueryManager.java
+++ b/src/main/java/org/dependencytrack/persistence/FindingsQueryManager.java
@@ -402,8 +402,10 @@ public List<Finding> getFindings(Project project, boolean includeSuppressed) {
                 .forEach(metaComponent -> {
                     final var search = new RepositoryMetaComponentSearch(metaComponent.getRepositoryType(), metaComponent.getNamespace(), metaComponent.getName());
                     final List<Finding> affectedFindings = findingsByMetaComponentSearch.get(search);
-                    for (final Finding finding : affectedFindings) {
-                        finding.getComponent().put("latestVersion", metaComponent.getLatestVersion());
+                    if (affectedFindings != null) {
+                        for (final Finding finding : affectedFindings) {
+                            finding.getComponent().put("latestVersion", metaComponent.getLatestVersion());
+                        }
                     }
                 });
         return findings;