diff --git a/Classes/Component/Core/DemandResolver/Select/SelectDemandResolver.php b/Classes/Component/Core/DemandResolver/Select/SelectDemandResolver.php
index 0831b7410..ab7f1d6f1 100644
--- a/Classes/Component/Core/DemandResolver/Select/SelectDemandResolver.php
+++ b/Classes/Component/Core/DemandResolver/Select/SelectDemandResolver.php
@@ -100,8 +100,11 @@ protected function createAndMapRecords(
                     if (null === $record) {
                         continue;
                     }
-                    $recordCollection->addRecord($record);
+                } else {
+                    $this->recordIndex->addRecord($record);
                 }
+
+                $recordCollection->addRecord($record);
                 $localMapValue = $record->getLocalProps()[$property] ?? null;
                 $foreignMapValue = $record->getForeignProps()[$property] ?? null;
                 $mapValues = array_unique([$localMapValue, $foreignMapValue]);