diff --git a/pkg/services/store/entity_events.go b/pkg/services/store/entity_events.go
index b56c98f5d92..a0c8a45bf12 100644
--- a/pkg/services/store/entity_events.go
+++ b/pkg/services/store/entity_events.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/registry"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -55,6 +56,7 @@ type SaveEventCmd struct {
 //go:generate mockery --name EntityEventsService --structname MockEntityEventsService --inpackage --filename entity_events_mock.go
 type EntityEventsService interface {
 	registry.BackgroundService
+	registry.CanBeDisabled
 	SaveEvent(ctx context.Context, cmd SaveEventCmd) error
 	GetLastEvent(ctx context.Context) (*EntityEvent, error)
 	GetAllEventsAfter(ctx context.Context, id int64) ([]*EntityEvent, error)
@@ -62,16 +64,22 @@ type EntityEventsService interface {
 	deleteEventsOlderThan(ctx context.Context, duration time.Duration) error
 }
 
-func ProvideEntityEventsService(cfg *setting.Cfg, sqlStore *sqlstore.SQLStore) EntityEventsService {
+func ProvideEntityEventsService(cfg *setting.Cfg, sqlStore *sqlstore.SQLStore, features featuremgmt.FeatureToggles) EntityEventsService {
+	if !features.IsEnabled(featuremgmt.FlagPanelTitleSearch) {
+		return &dummyEntityEventsService{}
+	}
+
 	return &entityEventService{
-		sql: sqlStore,
-		log: log.New("entity-events"),
+		sql:      sqlStore,
+		features: features,
+		log:      log.New("entity-events"),
 	}
 }
 
 type entityEventService struct {
-	sql *sqlstore.SQLStore
-	log log.Logger
+	sql      *sqlstore.SQLStore
+	log      log.Logger
+	features featuremgmt.FeatureToggles
 }
 
 func (e *entityEventService) SaveEvent(ctx context.Context, cmd SaveEventCmd) error {
@@ -117,6 +125,10 @@ func (e *entityEventService) deleteEventsOlderThan(ctx context.Context, duration
 	})
 }
 
+func (e *entityEventService) IsDisabled() bool {
+	return false
+}
+
 func (e *entityEventService) Run(ctx context.Context) error {
 	clean := time.NewTicker(1 * time.Hour)
 
@@ -136,3 +148,32 @@ func (e *entityEventService) Run(ctx context.Context) error {
 		}
 	}
 }
+
+type dummyEntityEventsService struct {
+}
+
+func (d dummyEntityEventsService) Run(ctx context.Context) error {
+	return nil
+}
+
+func (d dummyEntityEventsService) IsDisabled() bool {
+	return false
+}
+
+func (d dummyEntityEventsService) SaveEvent(ctx context.Context, cmd SaveEventCmd) error {
+	return nil
+}
+
+func (d dummyEntityEventsService) GetLastEvent(ctx context.Context) (*EntityEvent, error) {
+	return nil, nil
+}
+
+func (d dummyEntityEventsService) GetAllEventsAfter(ctx context.Context, id int64) ([]*EntityEvent, error) {
+	return make([]*EntityEvent, 0), nil
+}
+
+func (d dummyEntityEventsService) deleteEventsOlderThan(ctx context.Context, duration time.Duration) error {
+	return nil
+}
+
+var _ EntityEventsService = &dummyEntityEventsService{}
diff --git a/pkg/services/store/entity_events_mock.go b/pkg/services/store/entity_events_mock.go
index 0d21d9aa4d9..4360f8921a1 100644
--- a/pkg/services/store/entity_events_mock.go
+++ b/pkg/services/store/entity_events_mock.go
@@ -60,6 +60,20 @@ func (_m *MockEntityEventsService) GetLastEvent(ctx context.Context) (*EntityEve
 	return r0, r1
 }
 
+// IsDisabled provides a mock function with given fields:
+func (_m *MockEntityEventsService) IsDisabled() bool {
+	ret := _m.Called()
+
+	var r0 bool
+	if rf, ok := ret.Get(0).(func() bool); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	return r0
+}
+
 // Run provides a mock function with given fields: ctx
 func (_m *MockEntityEventsService) Run(ctx context.Context) error {
 	ret := _m.Called(ctx)
diff --git a/pkg/services/store/entity_events_test.go b/pkg/services/store/entity_events_test.go
index 19d15a6b29a..7f6ef9c99ca 100644
--- a/pkg/services/store/entity_events_test.go
+++ b/pkg/services/store/entity_events_test.go
@@ -14,7 +14,6 @@ import (
 )
 
 func TestEntityEventsService(t *testing.T) {
-
 	var ctx context.Context
 	var service EntityEventsService