diff --git a/src/mapper/pkg/metadatareporter/setup.go b/src/mapper/pkg/metadatareporter/setup.go
index f0cd2db2..f533c49f 100644
--- a/src/mapper/pkg/metadatareporter/setup.go
+++ b/src/mapper/pkg/metadatareporter/setup.go
@@ -13,6 +13,11 @@ import (
 func Setup(client client.Client, cloudClient cloudclient.CloudClient, resolver serviceidresolver.ServiceResolver, mgr ctrl.Manager) error {
 	reporter := NewMetadataReporter(client, cloudClient, resolver)
 
+	// Initialize indexes
+	if err := initIndexes(mgr); err != nil {
+		return errors.Wrap(err)
+	}
+
 	// Initialize the EndpointsReconciler
 	endpointsReconciler := NewEndpointsReconciler(client, resolver, reporter)
 	if err := endpointsReconciler.SetupWithManager(mgr); err != nil {
@@ -31,11 +36,6 @@ func Setup(client client.Client, cloudClient cloudclient.CloudClient, resolver s
 		return errors.Wrap(err)
 	}
 
-	// Initialize indexes
-	if err := initIndexes(mgr); err != nil {
-		return errors.Wrap(err)
-	}
-
 	return nil
 }
 func initIndexes(mgr ctrl.Manager) error {