diff --git a/services/search/pkg/search/events.go b/services/search/pkg/search/events.go
index 15da2efb0..b3eca1140 100644
--- a/services/search/pkg/search/events.go
+++ b/services/search/pkg/search/events.go
@@ -90,8 +90,10 @@ func HandleEvents(s Searcher, stream raw.Stream, cfg *config.Config, m *metrics.
 						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), e.Ack)
 					case events.TagsAdded:
 						s.UpsertItem(ev.Ref)
+						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), e.Ack)
 					case events.TagsRemoved:
 						s.UpsertItem(ev.Ref)
+						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), e.Ack)
 					case events.FileUploaded:
 						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), e.Ack)
 					case events.UploadReady:
diff --git a/services/search/pkg/search/events_test.go b/services/search/pkg/search/events_test.go
index 664078581..3eeb49924 100644
--- a/services/search/pkg/search/events_test.go
+++ b/services/search/pkg/search/events_test.go
@@ -53,8 +53,8 @@ var _ = DescribeTable("events",
 	Entry("ContainerCreated", []string{"IndexSpace"}, events.ContainerCreated{}, false),
 	Entry("FileTouched", []string{"IndexSpace"}, events.FileTouched{}, false),
 	Entry("FileVersionRestored", []string{"IndexSpace"}, events.FileVersionRestored{}, false),
-	Entry("TagsAdded", []string{"UpsertItem"}, events.TagsAdded{}, false),
-	Entry("TagsRemoved", []string{"UpsertItem"}, events.TagsRemoved{}, false),
+	Entry("TagsAdded", []string{"UpsertItem", "IndexSpace"}, events.TagsAdded{}, false),
+	Entry("TagsRemoved", []string{"UpsertItem", "IndexSpace"}, events.TagsRemoved{}, false),
 	Entry("FileUploaded", []string{"IndexSpace"}, events.FileUploaded{}, false),
 	Entry("UploadReady", []string{"IndexSpace"}, events.UploadReady{ExecutingUser: &userv1beta1.User{}}, true),
 )