diff --git a/app/enterprise.go b/app/enterprise.go
index 0578c9408e..589bbc44c0 100644
--- a/app/enterprise.go
+++ b/app/enterprise.go
@@ -120,6 +120,9 @@ func RegisterNotificationInterface(f func(*App) einterfaces.NotificationInterfac
 }
 
 func (s *Server) initEnterprise() {
+	if metricsInterface != nil {
+		s.Metrics = metricsInterface(s.FakeApp())
+	}
 	if accountMigrationInterface != nil {
 		s.AccountMigration = accountMigrationInterface(s)
 	}
@@ -135,9 +138,6 @@ func (s *Server) initEnterprise() {
 	if messageExportInterface != nil {
 		s.MessageExport = messageExportInterface(s.FakeApp())
 	}
-	if metricsInterface != nil {
-		s.Metrics = metricsInterface(s.FakeApp())
-	}
 	if notificationInterface != nil {
 		s.Notification = notificationInterface(s.FakeApp())
 	}
diff --git a/einterfaces/metrics.go b/einterfaces/metrics.go
index abcede5beb..c5d74fe903 100644
--- a/einterfaces/metrics.go
+++ b/einterfaces/metrics.go
@@ -45,4 +45,7 @@ type MetricsInterface interface {
 	ObservePostsSearchDuration(elapsed float64)
 	ObserveStoreMethodDuration(method string, success string, elapsed float64)
 	ObserveApiEndpointDuration(endpoint string, elapsed float64)
+	IncrementPostIndexCounter()
+	IncrementUserIndexCounter()
+	IncrementChannelIndexCounter()
 }