diff --git a/ui/component/channelMentionSuggestions/view.jsx b/ui/component/channelMentionSuggestions/view.jsx
index 194b3e40ba3..9529ba7177b 100644
--- a/ui/component/channelMentionSuggestions/view.jsx
+++ b/ui/component/channelMentionSuggestions/view.jsx
@@ -213,15 +213,17 @@ export default function ChannelMentionSuggestions(props: Props) {
     if (mentionTerm.length > 1 && suggestions !== results) {
       suggestions = suggestions.filter((uri) => possibleMatches.includes(uri));
     } else if (suggestions === results) {
-      suggestions = suggestions
-        .filter((uri) => !allShownUris.includes(uri))
-        .filter((uri) => !uri.includes(mostSupported));
+      suggestions = suggestions.filter((uri) => !allShownUris.includes(uri));
     }
     // $FlowFixMe
     suggestions = suggestions
       .map((matchUri) => canonical.find((uri) => matchUri.includes(uri)))
       .filter((uri) => Boolean(uri));
 
+    if (canonical === canonicalResults) {
+      suggestions = suggestions.filter((uri) => uri !== mostSupported);
+    }
+
     return !suggestions.length ? null : (
       <>
         <div className="channel-mention__label">{label}</div>