diff --git a/internal/migration/step.go b/internal/migration/step.go
index 036a0a1055..04cae07e32 100644
--- a/internal/migration/step.go
+++ b/internal/migration/step.go
@@ -18,6 +18,7 @@ type StepStates struct {
 // Query implements eventstore.QueryReducer.
 func (*StepStates) Query() *eventstore.SearchQueryBuilder {
 	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		InstanceID(""). // to make sure we can use an appropriate index
 		AddQuery().
 		AggregateTypes(SystemAggregate).
 		AggregateIDs(SystemAggregateID).