diff --git a/pkg/query/endpointset.go b/pkg/query/endpointset.go
index a9c0373d9e..e6f2042c05 100644
--- a/pkg/query/endpointset.go
+++ b/pkg/query/endpointset.go
@@ -532,6 +532,7 @@ func (e *EndpointSet) GetStoreClients() []store.Client {
 				StoreClient: storepb.NewStoreClient(er.cc),
 				addr:        er.addr,
 				metadata:    er.metadata,
+				status:      er.status,
 			})
 			er.mtx.RUnlock()
 		}
@@ -792,7 +793,7 @@ func (er *endpointRef) LabelSets() []labels.Labels {
 	er.mtx.RLock()
 	defer er.mtx.RUnlock()
 
-	return er.labelSets()
+	return er.status.LabelSets
 }
 
 func (er *endpointRef) labelSets() []labels.Labels {