diff --git a/server/compose/envoy/record_datasource.go b/server/compose/envoy/record_datasource.go
index 7056aabc2..5a755bb5b 100644
--- a/server/compose/envoy/record_datasource.go
+++ b/server/compose/envoy/record_datasource.go
@@ -57,7 +57,7 @@ func (rd *RecordDatasource) Next(ctx context.Context, out map[string]string) (id
 	rd.applyMapping(rd.rowCache, out)
 
 	for _, k := range rd.mapping.KeyField {
-		ident = append(ident, out[k])
+		ident = append(ident, rd.rowCache[k])
 	}
 
 	return