diff --git a/services/search/pkg/search/service.go b/services/search/pkg/search/service.go
index 0ef9eb37fc..e4a2769b32 100644
--- a/services/search/pkg/search/service.go
+++ b/services/search/pkg/search/service.go
@@ -92,6 +92,10 @@ func (s *Service) Search(ctx context.Context, req *searchsvc.SearchRequest) (*se
 	startTime := time.Now()
 	success := false
 	defer func() {
+		if s.metrics == nil {
+			return
+		}
+
 		status := "success"
 		if !success {
 			status = "error"
@@ -444,6 +448,9 @@ func (s *Service) IndexSpace(spaceID *provider.StorageSpaceId) error {
 	startTime := time.Now()
 	success := false
 	defer func() {
+		if s.metrics == nil {
+			return
+		}
 		status := "success"
 		if !success {
 			status = "error"
diff --git a/services/search/pkg/search/service_test.go b/services/search/pkg/search/service_test.go
index f7e9d01e47..c6f8eb0ef9 100644
--- a/services/search/pkg/search/service_test.go
+++ b/services/search/pkg/search/service_test.go
@@ -90,7 +90,7 @@ var _ = Describe("Searchprovider", func() {
 		indexClient = &engineMocks.Engine{}
 		extractor = &contentMocks.Extractor{}
 
-		s = search.NewService(gatewaySelector, indexClient, extractor, logger, &config.Config{})
+		s = search.NewService(gatewaySelector, indexClient, extractor, nil, logger, &config.Config{})
 
 		gatewayClient.On("Authenticate", mock.Anything, mock.Anything).Return(&gateway.AuthenticateResponse{
 			Status: status.NewOK(ctx),
@@ -110,7 +110,7 @@ var _ = Describe("Searchprovider", func() {
 
 	Describe("New", func() {
 		It("returns a new instance", func() {
-			s := search.NewService(gatewaySelector, indexClient, extractor, logger, &config.Config{})
+			s := search.NewService(gatewaySelector, indexClient, extractor, nil, logger, &config.Config{})
 			Expect(s).ToNot(BeNil())
 		})
 	})