diff --git a/src/main/java/com/olympus/hermione/stepSolvers/AdvancedQueryRagSolver.java b/src/main/java/com/olympus/hermione/stepSolvers/AdvancedQueryRagSolver.java
index 537f1b9..29ab8ac 100644
--- a/src/main/java/com/olympus/hermione/stepSolvers/AdvancedQueryRagSolver.java
+++ b/src/main/java/com/olympus/hermione/stepSolvers/AdvancedQueryRagSolver.java
@@ -290,7 +290,10 @@ public class AdvancedQueryRagSolver extends StepSolver {
         }
 
 
-        docs = docs.stream().collect(Collectors.toMap(Document::getId, d -> d, (d1, d2) -> d1)).values().stream().collect(Collectors.toList());
+        docs = docs.stream()
+            .filter(d -> d.getMetadata().get("KsDocumentId") != null)
+            .filter(d -> d.getMetadata().get("KsDocumentIndex") != null)
+            .collect(Collectors.toMap(Document::getId, d -> d, (d1, d2) -> d1)).values().stream().collect(Collectors.toList());
 
         //Sort by KsDocumentId and KsDocumentIndex
         docs.sort((d1, d2) -> {