diff --git a/app/server.go b/app/server.go
index e966ffcba4..2e961188e5 100644
--- a/app/server.go
+++ b/app/server.go
@@ -316,8 +316,8 @@ func NewServer(options ...Option) (*Server, error) {
 	}
 	model.AppErrorInit(i18n.T)
 
-	searchEngine := searchengine.NewBroker(s.Config(), s.Jobs)
-	bleveEngine := bleveengine.NewBleveEngine(s.Config(), s.Jobs)
+	searchEngine := searchengine.NewBroker(s.Config())
+	bleveEngine := bleveengine.NewBleveEngine(s.Config())
 	if err := bleveEngine.Start(); err != nil {
 		return nil, err
 	}
diff --git a/services/searchengine/bleveengine/bleve.go b/services/searchengine/bleveengine/bleve.go
index c6d1f50747..76bcb02d14 100644
--- a/services/searchengine/bleveengine/bleve.go
+++ b/services/searchengine/bleveengine/bleve.go
@@ -17,7 +17,6 @@ import (
 	"github.com/blevesearch/bleve/v2/analysis/analyzer/standard"
 	"github.com/blevesearch/bleve/v2/mapping"
 
-	"github.com/mattermost/mattermost-server/v6/jobs"
 	"github.com/mattermost/mattermost-server/v6/model"
 	"github.com/mattermost/mattermost-server/v6/shared/mlog"
 )
@@ -38,7 +37,6 @@ type BleveEngine struct {
 	Mutex        sync.RWMutex
 	ready        int32
 	cfg          *model.Config
-	jobServer    *jobs.JobServer
 	indexSync    bool
 }
 
@@ -120,10 +118,9 @@ func getUserIndexMapping() *mapping.IndexMappingImpl {
 	return indexMapping
 }
 
-func NewBleveEngine(cfg *model.Config, jobServer *jobs.JobServer) *BleveEngine {
+func NewBleveEngine(cfg *model.Config) *BleveEngine {
 	return &BleveEngine{
-		cfg:       cfg,
-		jobServer: jobServer,
+		cfg: cfg,
 	}
 }
 
diff --git a/services/searchengine/bleveengine/bleve_test.go b/services/searchengine/bleveengine/bleve_test.go
index 6bdba71f85..a0ed1e1736 100644
--- a/services/searchengine/bleveengine/bleve_test.go
+++ b/services/searchengine/bleveengine/bleve_test.go
@@ -60,10 +60,10 @@ func (s *BleveEngineTestSuite) setupStore() {
 	cfg.BleveSettings.IndexDir = model.NewString(s.IndexDir)
 	cfg.SqlSettings.DisableDatabaseSearch = model.NewBool(true)
 
-	s.SearchEngine = searchengine.NewBroker(cfg, nil)
+	s.SearchEngine = searchengine.NewBroker(cfg)
 	s.Store = searchlayer.NewSearchLayer(&testlib.TestStore{Store: s.SQLStore}, s.SearchEngine, cfg)
 
-	s.BleveEngine = NewBleveEngine(cfg, nil)
+	s.BleveEngine = NewBleveEngine(cfg)
 	s.BleveEngine.indexSync = true
 	s.SearchEngine.RegisterBleveEngine(s.BleveEngine)
 	if err := s.BleveEngine.Start(); err != nil {
diff --git a/services/searchengine/bleveengine/indexer/indexing_job_test.go b/services/searchengine/bleveengine/indexer/indexing_job_test.go
index 7f289c42e1..55f93d2f08 100644
--- a/services/searchengine/bleveengine/indexer/indexing_job_test.go
+++ b/services/searchengine/bleveengine/indexer/indexing_job_test.go
@@ -54,7 +54,7 @@ func TestBleveIndexer(t *testing.T) {
 			},
 		}
 
-		bleveEngine := bleveengine.NewBleveEngine(cfg, jobServer)
+		bleveEngine := bleveengine.NewBleveEngine(cfg)
 		aErr := bleveEngine.Start()
 		require.Nil(t, aErr)
 
diff --git a/services/searchengine/searchengine.go b/services/searchengine/searchengine.go
index 4eebadda72..55948e98e8 100644
--- a/services/searchengine/searchengine.go
+++ b/services/searchengine/searchengine.go
@@ -4,14 +4,12 @@
 package searchengine
 
 import (
-	"github.com/mattermost/mattermost-server/v6/jobs"
 	"github.com/mattermost/mattermost-server/v6/model"
 )
 
-func NewBroker(cfg *model.Config, jobServer *jobs.JobServer) *Broker {
+func NewBroker(cfg *model.Config) *Broker {
 	return &Broker{
-		cfg:       cfg,
-		jobServer: jobServer,
+		cfg: cfg,
 	}
 }
 
@@ -25,7 +23,6 @@ func (seb *Broker) RegisterBleveEngine(be SearchEngineInterface) {
 
 type Broker struct {
 	cfg                 *model.Config
-	jobServer           *jobs.JobServer
 	ElasticsearchEngine SearchEngineInterface
 	BleveEngine         SearchEngineInterface
 }
diff --git a/services/telemetry/telemetry_test.go b/services/telemetry/telemetry_test.go
index 483c36d667..bba229c86a 100644
--- a/services/telemetry/telemetry_test.go
+++ b/services/telemetry/telemetry_test.go
@@ -179,7 +179,7 @@ func TestEnsureTelemetryID(t *testing.T) {
 
 		testLogger, _ := mlog.NewLogger()
 
-		telemetryService := New(serverIfaceMock, storeMock, searchengine.NewBroker(cfg, nil), testLogger)
+		telemetryService := New(serverIfaceMock, storeMock, searchengine.NewBroker(cfg), testLogger)
 		assert.Equal(t, "test", telemetryService.TelemetryID)
 
 		telemetryService.ensureTelemetryID()
@@ -212,7 +212,7 @@ func TestEnsureTelemetryID(t *testing.T) {
 
 		testLogger, _ := mlog.NewLogger()
 
-		telemetryService := New(serverIfaceMock, storeMock, searchengine.NewBroker(cfg, nil), testLogger)
+		telemetryService := New(serverIfaceMock, storeMock, searchengine.NewBroker(cfg), testLogger)
 		assert.Equal(t, generatedID, telemetryService.TelemetryID)
 	})
 
@@ -232,7 +232,7 @@ func TestEnsureTelemetryID(t *testing.T) {
 
 		testLogger, _ := mlog.NewLogger()
 
-		telemetryService := New(serverIfaceMock, storeMock, searchengine.NewBroker(cfg, nil), testLogger)
+		telemetryService := New(serverIfaceMock, storeMock, searchengine.NewBroker(cfg), testLogger)
 		assert.Equal(t, "", telemetryService.TelemetryID)
 	})
 }
@@ -357,7 +357,7 @@ func TestRudderTelemetry(t *testing.T) {
 	}
 	defer testLogger.Shutdown()
 
-	telemetryService := New(serverIfaceMock, storeMock, searchengine.NewBroker(cfg, nil), testLogger)
+	telemetryService := New(serverIfaceMock, storeMock, searchengine.NewBroker(cfg), testLogger)
 	telemetryService.TelemetryID = telemetryID
 	telemetryService.rudderClient = nil
 	telemetryService.initRudder(server.URL, RudderKey)
diff --git a/store/searchlayer/layer_test.go b/store/searchlayer/layer_test.go
index 70878e4d21..cbc30409c7 100644
--- a/store/searchlayer/layer_test.go
+++ b/store/searchlayer/layer_test.go
@@ -29,7 +29,7 @@ func TestUpdateConfigRace(t *testing.T) {
 	cfg := &model.Config{}
 	cfg.SetDefaults()
 	cfg.ClusterSettings.MaxIdleConns = model.NewInt(1)
-	searchEngine := searchengine.NewBroker(cfg, nil)
+	searchEngine := searchengine.NewBroker(cfg)
 	layer := searchlayer.NewSearchLayer(&testlib.TestStore{Store: store}, searchEngine, cfg)
 	var wg sync.WaitGroup
 
diff --git a/testlib/helper.go b/testlib/helper.go
index 31c7b279c8..2e3c6b1c3a 100644
--- a/testlib/helper.go
+++ b/testlib/helper.go
@@ -102,7 +102,7 @@ func (h *MainHelper) setupStore(withReadReplica bool) {
 	config := &model.Config{}
 	config.SetDefaults()
 
-	h.SearchEngine = searchengine.NewBroker(config, nil)
+	h.SearchEngine = searchengine.NewBroker(config)
 	h.ClusterInterface = &FakeClusterInterface{}
 	h.SQLStore = sqlstore.New(*h.Settings, nil)
 	h.Store = searchlayer.NewSearchLayer(&TestStore{