diff --git a/src/app/features/message-search/useLocalMessageSearch.ts b/src/app/features/message-search/useLocalMessageSearch.ts
index eb438f1a0..b8e038bbe 100644
--- a/src/app/features/message-search/useLocalMessageSearch.ts
+++ b/src/app/features/message-search/useLocalMessageSearch.ts
@@ -205,8 +205,9 @@ export const useLocalMessageSearch = () => {
           const isMessageLike =
             evType === EventType.RoomMessage || POLL_START_TYPES.includes(evType);
 
-          // Sender-only mode indexes/returns all message types; text mode needs text.
-          if (!senderOnlyMode && !isMessageLike && !isSticker) continue;
+          // Both modes are restricted to message-like events/stickers — sender-only
+          // mode must not surface membership/state/reaction/redaction events (Gitea #62).
+          if (!isMessageLike && !isSticker) continue;
 
           const sender = event.getSender() ?? '';
           const ts = event.getTs();