diff --git a/src/storages/EventsDB.ts b/src/storages/EventsDB.ts
index c74fedb..3ade7e2 100644
--- a/src/storages/EventsDB.ts
+++ b/src/storages/EventsDB.ts
@@ -241,8 +241,9 @@ class EventsDB implements NStore {
   static buildUserSearchContent(event: NostrEvent): string {
     const { name, nip05 } = n.json().pipe(n.metadata()).catch({}).parse(event.content);
     const nip05splitted = nip05 ? nip05.split(/[_@.]/) : [];
+    const nip05splitted2 = nip05 ? nip05.split(/[@]/) : [];
 
-    return [name, nip05, ...nip05splitted].filter(Boolean).join('\n');
+    return [name, nip05, ...nip05splitted, ...nip05splitted2].filter(Boolean).join('\n');
   }
 
   /** Build search content from tag values. */