diff --git a/services/search/pkg/bleve/batch.go b/services/search/pkg/bleve/batch.go
index 78378430c6..60a3d0c867 100644
--- a/services/search/pkg/bleve/batch.go
+++ b/services/search/pkg/bleve/batch.go
@@ -71,6 +71,11 @@ func (b *Batch) Move(id, parentID, location string) error {
 			if err := b.batch.Index(resource.ID, resource); err != nil {
 				return err
 			}
+			if b.batch.Size() >= b.size {
+				if err := b.Push(); err != nil {
+					return err
+				}
+			}
 		}
 
 		return nil
@@ -88,6 +93,11 @@ func (b *Batch) Delete(id string) error {
 			if err := b.batch.Index(resource.ID, resource); err != nil {
 				return err
 			}
+			if b.batch.Size() >= b.size {
+				if err := b.Push(); err != nil {
+					return err
+				}
+			}
 		}
 
 		return nil
@@ -105,6 +115,11 @@ func (b *Batch) Restore(id string) error {
 			if err := b.batch.Index(resource.ID, resource); err != nil {
 				return err
 			}
+			if b.batch.Size() >= b.size {
+				if err := b.Push(); err != nil {
+					return err
+				}
+			}
 		}
 
 		return nil
@@ -142,6 +157,11 @@ func (b *Batch) Purge(id string, onlyDeleted bool) error {
 
 		for _, resource := range affectResources {
 			b.batch.Delete(resource.ID)
+			if b.batch.Size() >= b.size {
+				if err := b.Push(); err != nil {
+					return err
+				}
+			}
 		}
 
 		return nil
diff --git a/services/search/pkg/config/defaults/defaultconfig.go b/services/search/pkg/config/defaults/defaultconfig.go
index 555484bdcf..3e504350fa 100644
--- a/services/search/pkg/config/defaults/defaultconfig.go
+++ b/services/search/pkg/config/defaults/defaultconfig.go
@@ -64,7 +64,7 @@ func DefaultConfig() *config.Config {
 			AckWait:          1 * time.Minute,
 		},
 		ContentExtractionSizeLimit: 20 * 1024 * 1024, // Limit content extraction to <20MB files by default
-		BatchSize:                  500,
+		BatchSize:                  50,
 	}
 }