diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index eac2a7de..dab5db7f 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -473,8 +473,8 @@ export class ReactAutoPatcher {
     }
 
     static async patchGuild() {
-        const selector = `div.${Reflection.resolve('container', 'guildIcon', 'selected', 'unread').className}:not(:first-child)`;
-        this.Guild = await ReactComponents.getComponent('Guild', {selector}, m => m.prototype.renderBadge);
+        const { selector } = Reflection.resolve('listItem', 'guildSeparator', 'selected', 'friendsOnline');
+        this.Guild = await ReactComponents.getComponent('Guild', {selector}, m => m.displayName === 'Guild');
 
         this.unpatchGuild = MonkeyPatch('BD:ReactComponents', this.Guild.component.prototype).after('render', (component, args, retVal) => {
             const { guild } = component.props;