diff --git a/src/autocomplete/NotifProvider.tsx b/src/autocomplete/NotifProvider.tsx
index 52e235a1b1..a91a75598d 100644
--- a/src/autocomplete/NotifProvider.tsx
+++ b/src/autocomplete/NotifProvider.tsx
@@ -43,7 +43,9 @@ export default class NotifProvider extends AutocompleteProvider {
         if (!this.room.currentState.mayTriggerNotifOfType('room', client.credentials.userId)) return [];
 
         const { command, range } = this.getCurrentCommand(query, selection, force);
-        if (command && command[0] && '@room'.startsWith(command[0]) && command[0].length > 1) {
+        if (command?.[0].length > 1 &&
+            ['@room', '@channel', '@everyone', '@here'].some(c => c.startsWith(command[0]))
+        ) {
             return [{
                 completion: '@room',
                 completionId: '@room',