diff --git a/extensions/mentions/js/src/forum/addComposerAutocomplete.js b/extensions/mentions/js/src/forum/addComposerAutocomplete.js
index 0af1fe689..5d208c8c5 100644
--- a/extensions/mentions/js/src/forum/addComposerAutocomplete.js
+++ b/extensions/mentions/js/src/forum/addComposerAutocomplete.js
@@ -170,7 +170,7 @@ export default function addComposerAutocomplete() {
               }}
             >
               <span className="PostPreview-content">
-                <Badge class={`Avatar Badge Badge--group--${group.id()} Badge-icon `} color={group.color()} type="group" icon={group.icon()} />
+                <Badge class={`Avatar Badge Badge--group Badge--group--${group.id()} Badge-icon `} color={group.color()} type="group" icon={group.icon()} />
                 <span className="username">{groupName}</span>
               </span>
             </button>
diff --git a/extensions/mentions/less/forum.less b/extensions/mentions/less/forum.less
index 6c04ce38b..89ecca496 100644
--- a/extensions/mentions/less/forum.less
+++ b/extensions/mentions/less/forum.less
@@ -109,6 +109,9 @@
     color: @body-bg;
   }
 }
+.Badge--group {
+  box-shadow: none;
+}
 
 @media @phone {
   .MentionsDropdown {