diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index 67332581f..05052620e 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -95,6 +95,9 @@ export class SearchService {
 
 	@bindThis
 	public async indexNote(note: Note): Promise<void> {
+		if (note.text == null && note.cw == null) return;
+		if (!['home', 'public'].includes(note.visibility)) return;
+
 		if (this.meilisearch) {
 			this.meilisearchNoteIndex!.addDocuments([{
 				id: note.id,