diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbac2a7dad..c446baf892 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,7 +76,11 @@
 =======
 * [BUGFIX] Memberlist: forward only changes, not entire original message. #4419
 * [BUGFIX] Memberlist: don't accept old tombstones as incoming change, and don't forward such messages to other gossip members. #4420
+<<<<<<< HEAD
 >>>>>>> Clean up some changelog entries (#4458)
+=======
+* [BUGFIX] Querier: fixed panic when querying exemplars and using `-distributor.shard-by-all-labels=false`. #4473
+>>>>>>> fix querier panics when query exemplars (#4473)
 
 ## 1.10.0 / 2021-08-03
 
diff --git a/pkg/distributor/query.go b/pkg/distributor/query.go
index 87b45164dc..33797a241d 100644
--- a/pkg/distributor/query.go
+++ b/pkg/distributor/query.go
@@ -59,7 +59,7 @@ func (d *Distributor) QueryExemplars(ctx context.Context, from, to model.Time, m
 		}
 
 		// We ask for all ingesters without passing matchers because exemplar queries take in an array of array of label matchers.
-		replicationSet, err := d.GetIngestersForQuery(ctx, nil)
+		replicationSet, err := d.GetIngestersForQuery(ctx)
 		if err != nil {
 			return err
 		}